Merge remote-tracking branch 'origin/master' into develop

3 years ago · 904df296b0
parent 5021cf58ad e44b6242b7
commit 904df296b0
13 changed files with 11 additions and 15 deletions
--- 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 <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 // RGB Matrix defines
 #define DRIVER_ADDR_1 0b0110000

--- a/keyboards/acheron/apollo/87h/gamma/mcuconf.h
+++ b/keyboards/acheron/apollo/87h/gamma/mcuconf.h
@ -17,19 +17,6 @@
 #pragma once

 #include_next <mcuconf.h>
-#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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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