From e44b6242b70e3fc94b71ab3a463a0cf6b4dba280 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 15 Aug 2022 18:55:21 +0100 Subject: [PATCH] Migrate more F4x1 board files (#18054) --- keyboards/acheron/apollo/87h/gamma/config.h | 2 -- keyboards/acheron/apollo/87h/gamma/mcuconf.h | 13 ------------- keyboards/acheron/apollo/87h/gamma/rules.mk | 1 + .../charybdis/3x5/keymaps/drashna/rules.mk | 1 + .../dactyl_manuform/6x6/blackpill_f411/rules.mk | 1 + .../onekey/blackpill_f411_tinyuf2/rules.mk | 1 + keyboards/mechwild/bbs/rules.mk | 1 + keyboards/mlego/m60_split/rev1/rules.mk | 1 + keyboards/phoenix/rules.mk | 1 + keyboards/xelus/rs108/rules.mk | 1 + keyboards/xelus/rs60/rev2/rules.mk | 1 + keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk | 1 + keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk | 1 + 13 files changed, 11 insertions(+), 15 deletions(-) diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 451071f869..89f9a85d24 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -44,8 +44,6 @@ along with this program. If not, see . #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -#define STM32_HSECLK 8000000 - // RGB Matrix defines #define DRIVER_ADDR_1 0b0110000 diff --git a/keyboards/acheron/apollo/87h/gamma/mcuconf.h b/keyboards/acheron/apollo/87h/gamma/mcuconf.h index 5983bdde90..0113e71378 100644 --- a/keyboards/acheron/apollo/87h/gamma/mcuconf.h +++ b/keyboards/acheron/apollo/87h/gamma/mcuconf.h @@ -17,19 +17,6 @@ #pragma once #include_next -#undef STM32_PLLM_VALUE -#undef STM32_PLLN_VALUE -#undef STM32_PLLP_VALUE -#undef STM32_PLLQ_VALUE -#undef STM32_PPRE1 -#undef STM32_PPRE2 - -#define STM32_PLLM_VALUE 4 -#define STM32_PLLN_VALUE 96 -#define STM32_PLLP_VALUE 2 -#define STM32_PLLQ_VALUE 4 -#define STM32_PPRE1 STM32_PPRE1_DIV2 -#define STM32_PPRE2 STM32_PPRE2_DIV1 #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk index fde739dac7..4ba14045bb 100644 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ b/keyboards/acheron/apollo/87h/gamma/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = GENERIC_STM32_F411XE # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk index 0cff2a7a2e..1369213cf2 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection # BOOTLOADER = stm32-dfu diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk index af3cc49296..d929a3516d 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk @@ -3,6 +3,7 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection BOOTLOADER = tinyuf2 diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk index 70180ee790..2c38e9b580 100755 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = BLACKPILL_STM32_F411 # Bootloader selection BOOTLOADER = tinyuf2 diff --git a/keyboards/mechwild/bbs/rules.mk b/keyboards/mechwild/bbs/rules.mk index 0e59cba428..519b77b437 100644 --- a/keyboards/mechwild/bbs/rules.mk +++ b/keyboards/mechwild/bbs/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = BLACKPILL_STM32_F401 # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk index 14022f2086..1a09f141b7 100644 --- a/keyboards/mlego/m60_split/rev1/rules.mk +++ b/keyboards/mlego/m60_split/rev1/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = BLACKPILL_STM32_F401 # Bootloader selection BOOTLOADER = tinyuf2 diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk index f895b3d316..c155cd0988 100644 --- a/keyboards/phoenix/rules.mk +++ b/keyboards/phoenix/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = BLACKPILL_STM32_F401 # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/xelus/rs108/rules.mk b/keyboards/xelus/rs108/rules.mk index 86ab82cc61..46df2e4e8e 100644 --- a/keyboards/xelus/rs108/rules.mk +++ b/keyboards/xelus/rs108/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/xelus/rs60/rev2/rules.mk b/keyboards/xelus/rs60/rev2/rules.mk index 95c0f0bc60..3bf99c0be7 100644 --- a/keyboards/xelus/rs60/rev2/rules.mk +++ b/keyboards/xelus/rs60/rev2/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk index ba22afdc26..0747b349ab 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk +++ b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F411 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu diff --git a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk index 72dda3e6f8..6b2ee6520d 100644 --- a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk +++ b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk @@ -1,5 +1,6 @@ # MCU name MCU = STM32F401 +BOARD = GENERIC_STM32_F401XC # Bootloader selection BOOTLOADER = stm32-dfu