Migrate more F4x1 board files (#18046)

2022-08-15 00:25:40 +01:00 · 2022-08-15 00:25:40 +01:00 · 93fb69fbda
parent 3d3e463598
commit 93fb69fbda
25 changed files with 14 additions and 90 deletions
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@ -36,8 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DRIVER_LED_TOTAL 62
 #define ISSI_PWM_FREQUENCY 0b010

-#define STM32_HSECLK 8000000
-
 #define RGB_MATRIX_STARTUP_VAL 80
 #define RGB_MATRIX_KEYPRESSES

--- a/keyboards/4pplet/perk60_iso/rev_a/mcuconf.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/mcuconf.h
@ -22,19 +22,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                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#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/4pplet/perk60_iso/rev_a/rules.mk
+++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = GENERIC_STM32_F411XE

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/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
-
 #define RGB_DI_PIN B15
 #define DRIVER_LED_TOTAL 87

--- a/keyboards/acheron/apollo/87h/delta/mcuconf.h
+++ b/keyboards/acheron/apollo/87h/delta/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                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#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/delta/rules.mk
+++ b/keyboards/acheron/apollo/87h/delta/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@ -40,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 #define RGB_DI_PIN B15
 #define DRIVER_LED_TOTAL 86

--- a/keyboards/acheron/apollo/87htsc/mcuconf.h
+++ b/keyboards/acheron/apollo/87htsc/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                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#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/87htsc/rules.mk
+++ b/keyboards/acheron/apollo/87htsc/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@ -40,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

-#define STM32_HSECLK 8000000
-
 #define RGB_DI_PIN B15
 #define DRIVER_LED_TOTAL 87

--- a/keyboards/acheron/apollo/88htsc/mcuconf.h
+++ b/keyboards/acheron/apollo/88htsc/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                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#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/88htsc/rules.mk
+++ b/keyboards/acheron/apollo/88htsc/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@ -41,8 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BREATHING_PERIOD 5
 #define BACKLIGHT_ON_STATE 0

-#define STM32_HSECLK 8000000
-
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 34
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/acheron/athena/alpha/mcuconf.h
+++ b/keyboards/acheron/athena/alpha/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/athena/alpha/rules.mk
+++ b/keyboards/acheron/athena/alpha/rules.mk
@ -1,4 +1,6 @@
+# MCU name
 MCU = STM32F411
+BOARD = GENERIC_STM32_F411XE

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@ -40,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BREATHING_PERIOD 5

-#define STM32_HSECLK 8000000
-
 #define RGB_DI_PIN B15
 #define RGBLED_NUM 34
 #define RGBLIGHT_EFFECT_BREATHING
--- a/keyboards/acheron/athena/beta/mcuconf.h
+++ b/keyboards/acheron/athena/beta/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                    168
-#define STM32_PLLP_VALUE                    4
-#define STM32_PLLQ_VALUE                    7
-#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/athena/beta/rules.mk
+++ b/keyboards/acheron/athena/beta/rules.mk
@ -1,4 +1,5 @@
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/puckbuddy/rules.mk
+++ b/keyboards/mechwild/puckbuddy/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mlego/m48/rev1/rules.mk
+++ b/keyboards/mlego/m48/rev1/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = tinyuf2
--- a/keyboards/mlego/m60/rev1/rules.mk
+++ b/keyboards/mlego/m60/rev1/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = tinyuf2
--- a/keyboards/mlego/m65/rev3/rules.mk
+++ b/keyboards/mlego/m65/rev3/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = tinyuf2
--- a/keyboards/mlego/m65/rev4/rules.mk
+++ b/keyboards/mlego/m65/rev4/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = tinyuf2
--- a/keyboards/yandrstudio/nz64/rules.mk
+++ b/keyboards/yandrstudio/nz64/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/yandrstudio/zhou65/rules.mk
+++ b/keyboards/yandrstudio/zhou65/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = GENERIC_STM32_F401XC

 # Bootloader selection
 BOOTLOADER = stm32-dfu