From 464f57b4a3fac03b52e2f0330f74adde6e131918 Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Wed, 26 Oct 2022 11:57:02 +0200 Subject: [PATCH] boards: Remove PLL overrides in kconfig Since we know the HSE speed, manual overrides are not needed anymore --- boards/common/iotlab/Kconfig | 5 ++--- boards/common/iotlab/Makefile.features | 3 --- boards/common/iotlab/clock.config | 4 ---- boards/common/weact-f4x1cx/Kconfig | 5 ++--- boards/common/weact-f4x1cx/Makefile.features | 2 -- boards/common/weact-f4x1cx/clock.config | 4 ---- boards/f4vi1/Kconfig | 5 ++--- boards/im880b/Kconfig | 5 ++--- boards/lora-e5-dev/Kconfig | 5 ++--- boards/msbiot/Kconfig | 5 ++--- boards/nucleo-wl55jc/Kconfig | 5 ++--- boards/p-nucleo-wb55/Kconfig | 5 ++--- boards/pyboard/Kconfig | 5 ++--- boards/stm32f469i-disco/Kconfig | 5 ++--- boards/stm32f723e-disco/Kconfig | 5 ++--- boards/stm32f723e-disco/Makefile.features | 3 --- boards/stm32f723e-disco/clock.config | 5 ----- boards/stm32f746g-disco/Kconfig | 5 ++--- boards/stm32f746g-disco/clock.config | 5 ----- boards/stm32f746g-disco/features-shared.mk | 3 --- boards/stm32f7508-dk/Kconfig | 5 ++--- boards/stm32f769i-disco/Kconfig | 5 ++--- boards/stm32f769i-disco/Makefile.features | 3 --- boards/stm32f769i-disco/clock.config | 5 ----- boards/ublox-c030-u201/Kconfig | 5 ++--- boards/ublox-c030-u201/Makefile.features | 3 --- boards/ublox-c030-u201/clock.config | 5 ----- boards/weact-f401cc/Makefile.features | 3 --- boards/weact-f401cc/clock.config | 1 - boards/weact-f401ce/Makefile.features | 3 --- boards/weact-f401ce/clock.config | 1 - boards/weact-f411ce/Makefile.features | 3 --- boards/weact-f411ce/clock.config | 1 - 33 files changed, 30 insertions(+), 102 deletions(-) delete mode 100644 boards/common/iotlab/clock.config delete mode 100644 boards/common/weact-f4x1cx/clock.config delete mode 100644 boards/stm32f723e-disco/clock.config delete mode 100644 boards/stm32f746g-disco/clock.config delete mode 100644 boards/stm32f769i-disco/clock.config delete mode 100644 boards/ublox-c030-u201/clock.config delete mode 100644 boards/weact-f401cc/clock.config delete mode 100644 boards/weact-f401ce/clock.config delete mode 100644 boards/weact-f411ce/clock.config diff --git a/boards/common/iotlab/Kconfig b/boards/common/iotlab/Kconfig index 36a8810791e6..f346823360fb 100644 --- a/boards/common/iotlab/Kconfig +++ b/boards/common/iotlab/Kconfig @@ -27,9 +27,8 @@ config BOARD_COMMON_IOTLAB select HAVE_L3G4200D select HAVE_LSM303DLHC -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_16MHZ -endchoice +config CLOCK_HSE + default 16000000 config MODULE_BOARDS_COMMON_IOTLAB bool diff --git a/boards/common/iotlab/Makefile.features b/boards/common/iotlab/Makefile.features index ba0bff2db2f0..455b73500d7b 100644 --- a/boards/common/iotlab/Makefile.features +++ b/boards/common/iotlab/Makefile.features @@ -11,6 +11,3 @@ FEATURES_PROVIDED += periph_uart # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += riotboot - -# iotlab boards provide a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/common/iotlab/clock.config diff --git a/boards/common/iotlab/clock.config b/boards/common/iotlab/clock.config deleted file mode 100644 index a2c08246e3a9..000000000000 --- a/boards/common/iotlab/clock.config +++ /dev/null @@ -1,4 +0,0 @@ -# iotlab based boards provide a 16MHz HSE so they need a predivider of 2 -# to remain with a 72MHz sysclk by default. -CONFIG_CUSTOM_PLL_PARAMS=y -CONFIG_CLOCK_PLL_PREDIV=2 diff --git a/boards/common/weact-f4x1cx/Kconfig b/boards/common/weact-f4x1cx/Kconfig index 5e400e67ef7f..9905647f18dd 100644 --- a/boards/common/weact-f4x1cx/Kconfig +++ b/boards/common/weact-f4x1cx/Kconfig @@ -28,9 +28,8 @@ config BOARD_COMMON_WEACT_F4X1CX select HAVE_SAUL_GPIO select HAVE_MTD_SPI_NOR -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_25MHZ -endchoice +config CLOCK_HSE + default 25000000 config MODULE_BOARDS_COMMON_WEACT-F4X1CX bool diff --git a/boards/common/weact-f4x1cx/Makefile.features b/boards/common/weact-f4x1cx/Makefile.features index 6a2f08acdaed..5bb974e4cd93 100644 --- a/boards/common/weact-f4x1cx/Makefile.features +++ b/boards/common/weact-f4x1cx/Makefile.features @@ -14,8 +14,6 @@ FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += highlevel_stdio FEATURES_PROVIDED += tinyusb_device -# weact-f4x1cx boards provide a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/common/weact-f4x1cx/clock.config # This configuration enables modules that are only available when using Kconfig # module modelling diff --git a/boards/common/weact-f4x1cx/clock.config b/boards/common/weact-f4x1cx/clock.config deleted file mode 100644 index 945b9e4add1b..000000000000 --- a/boards/common/weact-f4x1cx/clock.config +++ /dev/null @@ -1,4 +0,0 @@ -# weact-f4x1cx based boards provide a 25MHz HSE so they need a custom PLL config -# to output a 48MHz clock for USB. -CONFIG_CUSTOM_PLL_PARAMS=y -CONFIG_CLOCK_PLL_M=25 diff --git a/boards/f4vi1/Kconfig b/boards/f4vi1/Kconfig index c5e35f60311d..24d4655762d5 100644 --- a/boards/f4vi1/Kconfig +++ b/boards/f4vi1/Kconfig @@ -21,9 +21,8 @@ config BOARD_F4VI1 select BOARD_HAS_HSE select BOARD_HAS_LSE -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_16MHZ -endchoice +config CLOCK_HSE + default 16000000 config CLOCK_PLL_M default 16 diff --git a/boards/im880b/Kconfig b/boards/im880b/Kconfig index 6d526e1a940d..b653be069b0e 100644 --- a/boards/im880b/Kconfig +++ b/boards/im880b/Kconfig @@ -25,8 +25,7 @@ config BOARD_IM880B select BOARD_HAS_HSE select BOARD_HAS_LSE -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_16MHZ -endchoice +config CLOCK_HSE + default 16000000 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/lora-e5-dev/Kconfig b/boards/lora-e5-dev/Kconfig index 082f7bfd820b..ae10e390c372 100644 --- a/boards/lora-e5-dev/Kconfig +++ b/boards/lora-e5-dev/Kconfig @@ -33,9 +33,8 @@ config BOARD_LORA_E5_DEV select HAVE_SAUL_GPIO select HAVE_LM75A -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_32MHZ -endchoice +config CLOCK_HSE + default 32000000 config LORA_E5_DEV_ENABLE_3P3V bool "LoRa-E5 Development Kit - Enable 3.3V output" diff --git a/boards/msbiot/Kconfig b/boards/msbiot/Kconfig index 36e709120ab1..c25a03b59296 100644 --- a/boards/msbiot/Kconfig +++ b/boards/msbiot/Kconfig @@ -30,9 +30,8 @@ config BOARD_MSBIOT select HAVE_MPU9150 select HAVE_SAUL_GPIO -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_16MHZ -endchoice +config CLOCK_HSE + default 16000000 config CLOCK_PLL_M default 16 diff --git a/boards/nucleo-wl55jc/Kconfig b/boards/nucleo-wl55jc/Kconfig index 520579906c2e..cc7ba278813e 100644 --- a/boards/nucleo-wl55jc/Kconfig +++ b/boards/nucleo-wl55jc/Kconfig @@ -28,8 +28,7 @@ config BOARD_NUCLEO_WL55JC select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_32MHZ -endchoice +config CLOCK_HSE + default 32000000 source "$(RIOTBOARD)/common/nucleo64/Kconfig" diff --git a/boards/p-nucleo-wb55/Kconfig b/boards/p-nucleo-wb55/Kconfig index b0975d5e51b7..1351bf5d2ca3 100644 --- a/boards/p-nucleo-wb55/Kconfig +++ b/boards/p-nucleo-wb55/Kconfig @@ -33,8 +33,7 @@ config BOARD_P_NUCLEO_WB55 select BOARD_HAS_HSE select BOARD_HAS_LSE -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_32MHZ -endchoice +config CLOCK_HSE + default 32000000 source "$(RIOTBOARD)/common/nucleo/Kconfig" diff --git a/boards/pyboard/Kconfig b/boards/pyboard/Kconfig index 9d2f49a075a2..c189d3488200 100644 --- a/boards/pyboard/Kconfig +++ b/boards/pyboard/Kconfig @@ -31,9 +31,8 @@ config BOARD_PYBOARD select HAVE_SAUL_GPIO -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_12MHZ -endchoice +config CLOCK_HSE + default 12000000 config CLOCK_PLL_M default 12 diff --git a/boards/stm32f469i-disco/Kconfig b/boards/stm32f469i-disco/Kconfig index d60cb3ab829a..9cc6e019b49a 100644 --- a/boards/stm32f469i-disco/Kconfig +++ b/boards/stm32f469i-disco/Kconfig @@ -27,8 +27,7 @@ config BOARD_STM32F469I_DISCO select HAVE_SAUL_GPIO -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_8MHZ -endchoice +config CLOCK_HSE + default 8000000 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/stm32f723e-disco/Kconfig b/boards/stm32f723e-disco/Kconfig index 5f949522c16a..86b6923c01d5 100644 --- a/boards/stm32f723e-disco/Kconfig +++ b/boards/stm32f723e-disco/Kconfig @@ -37,9 +37,8 @@ config BOARD_STM32F723E_DISCO # Workaround due to stdout only working with stdin enabled select MODULE_STDIN if TEST_KCONFIG -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_25MHZ -endchoice +config CLOCK_HSE + default 25000000 config MODULE_PERIPH_INIT_LED0 default n if MODULE_PERIPH_SPI diff --git a/boards/stm32f723e-disco/Makefile.features b/boards/stm32f723e-disco/Makefile.features index 983f775e2b11..45efd116eca4 100644 --- a/boards/stm32f723e-disco/Makefile.features +++ b/boards/stm32f723e-disco/Makefile.features @@ -15,6 +15,3 @@ FEATURES_PROVIDED += periph_usbdev_hs_utmi # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += tinyusb_device - -# stm32f723e-disco provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/stm32f723e-disco/clock.config diff --git a/boards/stm32f723e-disco/clock.config b/boards/stm32f723e-disco/clock.config deleted file mode 100644 index 607e0576f6d2..000000000000 --- a/boards/stm32f723e-disco/clock.config +++ /dev/null @@ -1,5 +0,0 @@ -# stm32f723e-disco provides a 25MHz HSE so they need a custom PLL config -# to remain in 216MHz max clock. -CONFIG_CUSTOM_PLL_PARAMS=y -CONFIG_CLOCK_PLL_M=25 -CONFIG_CLOCK_PLL_N=432 diff --git a/boards/stm32f746g-disco/Kconfig b/boards/stm32f746g-disco/Kconfig index a426ab374142..18fbf0842ff9 100644 --- a/boards/stm32f746g-disco/Kconfig +++ b/boards/stm32f746g-disco/Kconfig @@ -35,9 +35,8 @@ config BOARD_STM32F746G_DISCO select HAVE_FT5X06 -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_25MHZ -endchoice +config CLOCK_HSE + default 25000000 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/stm32f746g-disco/clock.config b/boards/stm32f746g-disco/clock.config deleted file mode 100644 index cb4034b254a6..000000000000 --- a/boards/stm32f746g-disco/clock.config +++ /dev/null @@ -1,5 +0,0 @@ -# stm32f746g-disco provides a 25MHz HSE so they need a custom PLL config -# to remain in 216MHz max clock. -CONFIG_CUSTOM_PLL_PARAMS=y -CONFIG_CLOCK_PLL_M=25 -CONFIG_CLOCK_PLL_N=432 diff --git a/boards/stm32f746g-disco/features-shared.mk b/boards/stm32f746g-disco/features-shared.mk index 2e2d5ecb416e..ad20ec6fe562 100644 --- a/boards/stm32f746g-disco/features-shared.mk +++ b/boards/stm32f746g-disco/features-shared.mk @@ -11,6 +11,3 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev_hs_ulpi FEATURES_PROVIDED += tinyusb_device - -# stm32f746g-disco provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/stm32f746g-disco/clock.config diff --git a/boards/stm32f7508-dk/Kconfig b/boards/stm32f7508-dk/Kconfig index 783c74a33823..5573789d533f 100644 --- a/boards/stm32f7508-dk/Kconfig +++ b/boards/stm32f7508-dk/Kconfig @@ -34,8 +34,7 @@ config BOARD_STM32F7508_DK select HAVE_STM32_ETH select HAVE_FT5X06 -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_25MHZ -endchoice +config CLOCK_HSE + default 25000000 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/stm32f769i-disco/Kconfig b/boards/stm32f769i-disco/Kconfig index 3807f8fc45f9..aef5b3603354 100644 --- a/boards/stm32f769i-disco/Kconfig +++ b/boards/stm32f769i-disco/Kconfig @@ -30,9 +30,8 @@ config BOARD_STM32F769I_DISCO select HAVE_SAUL_GPIO -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_25MHZ -endchoice +config CLOCK_HSE + default 25000000 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/stm32f769i-disco/Makefile.features b/boards/stm32f769i-disco/Makefile.features index 7577140b5eda..17c78c609894 100644 --- a/boards/stm32f769i-disco/Makefile.features +++ b/boards/stm32f769i-disco/Makefile.features @@ -10,6 +10,3 @@ FEATURES_PROVIDED += periph_usbdev # Put other features for this board (in alphabetical order) FEATURES_PROVIDED += tinyusb_device - -# stm32f769i-disco provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/stm32f769i-disco/clock.config diff --git a/boards/stm32f769i-disco/clock.config b/boards/stm32f769i-disco/clock.config deleted file mode 100644 index ea639c8bd1f2..000000000000 --- a/boards/stm32f769i-disco/clock.config +++ /dev/null @@ -1,5 +0,0 @@ -# stm32f769i-disco provides a 25MHz HSE so they need a custom PLL config -# to remain in 216MHz max clock. -CONFIG_CUSTOM_PLL_PARAMS=y -CONFIG_CLOCK_PLL_M=25 -CONFIG_CLOCK_PLL_N=432 diff --git a/boards/ublox-c030-u201/Kconfig b/boards/ublox-c030-u201/Kconfig index 18c5206469ce..fc73c1fa7b6b 100644 --- a/boards/ublox-c030-u201/Kconfig +++ b/boards/ublox-c030-u201/Kconfig @@ -30,8 +30,7 @@ config BOARD_UBLOX_C030_U201 select HAVE_SAUL_GPIO select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC -choice CHOICE_CLOCK_HSE - default CLOCK_HSE_12MHZ -endchoice +config CLOCK_HSE + default 12000000 source "$(RIOTBOARD)/common/stm32/Kconfig" diff --git a/boards/ublox-c030-u201/Makefile.features b/boards/ublox-c030-u201/Makefile.features index d25489c730e2..3643e1c2db90 100644 --- a/boards/ublox-c030-u201/Makefile.features +++ b/boards/ublox-c030-u201/Makefile.features @@ -10,6 +10,3 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_timer FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_uart_hw_fc - -# ublox-c030-u201 provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/ublox-c030-u201/clock.config diff --git a/boards/ublox-c030-u201/clock.config b/boards/ublox-c030-u201/clock.config deleted file mode 100644 index 778fb18fa254..000000000000 --- a/boards/ublox-c030-u201/clock.config +++ /dev/null @@ -1,5 +0,0 @@ -# ublox-c030-u201 provides a 12MHz HSE so its needs a custom PLL config to -# output a 180MHz clock. -CONFIG_CUSTOM_PLL_PARAMS=y -CONFIG_CLOCK_PLL_M=12 -CONFIG_CLOCK_PLL_N=360 diff --git a/boards/weact-f401cc/Makefile.features b/boards/weact-f401cc/Makefile.features index fa1a35efbf0c..49c258a11a81 100644 --- a/boards/weact-f401cc/Makefile.features +++ b/boards/weact-f401cc/Makefile.features @@ -1,6 +1,3 @@ CPU_MODEL = stm32f401cc include $(RIOTBOARD)/common/weact-f4x1cx/Makefile.features - -# weact-f401cc provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/weact-f401cc/clock.config diff --git a/boards/weact-f401cc/clock.config b/boards/weact-f401cc/clock.config deleted file mode 100644 index b6a5c5f93857..000000000000 --- a/boards/weact-f401cc/clock.config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CLOCK_PLL_N=336 diff --git a/boards/weact-f401ce/Makefile.features b/boards/weact-f401ce/Makefile.features index 6921886adc27..1417cb4e9d02 100644 --- a/boards/weact-f401ce/Makefile.features +++ b/boards/weact-f401ce/Makefile.features @@ -1,6 +1,3 @@ CPU_MODEL = stm32f401ce include $(RIOTBOARD)/common/weact-f4x1cx/Makefile.features - -# weact-f401ce provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/weact-f401ce/clock.config diff --git a/boards/weact-f401ce/clock.config b/boards/weact-f401ce/clock.config deleted file mode 100644 index b6a5c5f93857..000000000000 --- a/boards/weact-f401ce/clock.config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CLOCK_PLL_N=336 diff --git a/boards/weact-f411ce/Makefile.features b/boards/weact-f411ce/Makefile.features index 8f3a504e1680..464bf16c20f1 100644 --- a/boards/weact-f411ce/Makefile.features +++ b/boards/weact-f411ce/Makefile.features @@ -1,6 +1,3 @@ CPU_MODEL = stm32f411ce include $(RIOTBOARD)/common/weact-f4x1cx/Makefile.features - -# weact-f411ce provides a custom default Kconfig clock configuration -KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/weact-f411ce/clock.config diff --git a/boards/weact-f411ce/clock.config b/boards/weact-f411ce/clock.config deleted file mode 100644 index 2328d09ebee5..000000000000 --- a/boards/weact-f411ce/clock.config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CLOCK_PLL_N=192