boards: Remove PLL overrides in kconfig

Since we know the HSE speed, manual overrides are not needed anymore
RIOT-OS · Nov 3, 2022 · 259c003 · 259c003
1 parent 28aed3c
commit 259c003
Show file tree

Hide file tree

Showing 33 changed files with 30 additions and 97 deletions.
diff --git 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
@@ -12,5 +12,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
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,5 +16,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
diff --git 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
diff --git a/boards/stm32f746g-disco/features-shared.mk b/boards/stm32f746g-disco/features-shared.mk
@@ -12,5 +12,3 @@ 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
@@ -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
@@ -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
@@ -11,5 +11,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
diff --git 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
@@ -11,5 +11,3 @@ 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
diff --git 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
diff --git 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
diff --git 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