Merge pull request #18797 from MrKevinWeiss/pr/fixstmclk

cpu/stm32: Fix stm clock configuration
RIOT-OS · Nov 15, 2022 · 35149bd · 35149bd
2 parents 643aeda + 464f57b
commit 35149bd
Show file tree

Hide file tree

Showing 97 changed files with 1,035 additions and 609 deletions.
diff --git a/boards/common/iotlab/Kconfig b/boards/common/iotlab/Kconfig
@@ -27,6 +27,9 @@ config BOARD_COMMON_IOTLAB
     select HAVE_L3G4200D
     select HAVE_LSM303DLHC
 
+config CLOCK_HSE
+    default 16000000
+
 config MODULE_BOARDS_COMMON_IOTLAB
     bool
     depends on TEST_KCONFIG

diff --git 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
diff --git a/boards/common/iotlab/include/periph_conf_common.h b/boards/common/iotlab/include/periph_conf_common.h
@@ -29,7 +29,10 @@
 #ifndef CONFIG_BOARD_HAS_HSE
 #define CONFIG_BOARD_HAS_HSE    1
 #endif
-#define CLOCK_HSE               MHZ(16)
+
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(16)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/common/weact-f4x1cx/Kconfig b/boards/common/weact-f4x1cx/Kconfig
@@ -28,6 +28,9 @@ config BOARD_COMMON_WEACT_F4X1CX
     select HAVE_SAUL_GPIO
     select HAVE_MTD_SPI_NOR
 
+config CLOCK_HSE
+    default 25000000
+
 config MODULE_BOARDS_COMMON_WEACT-F4X1CX
     bool
     depends on TEST_KCONFIG

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/common/weact-f4x1cx/include/periph_conf.h b/boards/common/weact-f4x1cx/include/periph_conf.h
@@ -33,7 +33,9 @@
 #endif
 
 /* The HSE provides a 25MHz clock */
-#define CLOCK_HSE               MHZ(25)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(25)
+#endif
 
 #include "clk_conf.h"
 #include "cfg_i2c1_pb8_pb9.h"

diff --git a/boards/f4vi1/Kconfig b/boards/f4vi1/Kconfig
@@ -21,6 +21,9 @@ config BOARD_F4VI1
     select BOARD_HAS_HSE
     select BOARD_HAS_LSE
 
+config CLOCK_HSE
+    default 16000000
+
 config CLOCK_PLL_M
     default 16
 

diff --git a/boards/f4vi1/include/periph_conf.h b/boards/f4vi1/include/periph_conf.h
@@ -27,7 +27,9 @@
 #endif
 
 /* The HSE provides a 16MHz clock */
-#define CLOCK_HSE               MHZ(16)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(16)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/im880b/Kconfig b/boards/im880b/Kconfig
@@ -22,6 +22,10 @@ config BOARD_IM880B
     select HAS_PERIPH_UART
 
     # Clock configuration
+    select BOARD_HAS_HSE
     select BOARD_HAS_LSE
 
+config CLOCK_HSE
+    default 16000000
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
diff --git a/boards/im880b/include/periph_conf.h b/boards/im880b/include/periph_conf.h
@@ -36,7 +36,9 @@
 /**
  * @brief   Speed of the HSE clock in Hz
  */
-#define CLOCK_HSE                       MHZ(16)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE                       MHZ(16)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/lora-e5-dev/Kconfig b/boards/lora-e5-dev/Kconfig
@@ -33,6 +33,9 @@ config BOARD_LORA_E5_DEV
     select HAVE_SAUL_GPIO
     select HAVE_LM75A
 
+config CLOCK_HSE
+    default 32000000
+
 config LORA_E5_DEV_ENABLE_3P3V
     bool "LoRa-E5 Development Kit - Enable 3.3V output"
     default y

diff --git a/boards/lora-e5-dev/include/periph_conf.h b/boards/lora-e5-dev/include/periph_conf.h
@@ -30,7 +30,9 @@
 #define CONFIG_BOARD_HAS_HSE            1
 #endif
 
-#define CLOCK_HSE                       MHZ(32)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE                       MHZ(32)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/msbiot/Kconfig b/boards/msbiot/Kconfig
@@ -30,6 +30,9 @@ config BOARD_MSBIOT
     select HAVE_MPU9150
     select HAVE_SAUL_GPIO
 
+config CLOCK_HSE
+    default 16000000
+
 config CLOCK_PLL_M
     default 16
 

diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h
@@ -25,7 +25,9 @@
 #endif
 
 /* The HSE provides a 16MHz clock */
-#define CLOCK_HSE               MHZ(16)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(16)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/nucleo-wl55jc/Kconfig b/boards/nucleo-wl55jc/Kconfig
@@ -28,4 +28,7 @@ config BOARD_NUCLEO_WL55JC
 
     select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
 
+config CLOCK_HSE
+    default 32000000
+
 source "$(RIOTBOARD)/common/nucleo64/Kconfig"
diff --git a/boards/nucleo-wl55jc/include/periph_conf.h b/boards/nucleo-wl55jc/include/periph_conf.h
@@ -31,7 +31,9 @@
 #define CONFIG_BOARD_HAS_HSE            1
 #endif
 
-#define CLOCK_HSE                       MHZ(32)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE                       MHZ(32)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/p-nucleo-wb55/Kconfig b/boards/p-nucleo-wb55/Kconfig
@@ -33,4 +33,7 @@ config BOARD_P_NUCLEO_WB55
     select BOARD_HAS_HSE
     select BOARD_HAS_LSE
 
+config CLOCK_HSE
+    default 32000000
+
 source "$(RIOTBOARD)/common/nucleo/Kconfig"
diff --git a/boards/p-nucleo-wb55/include/periph_conf.h b/boards/p-nucleo-wb55/include/periph_conf.h
@@ -28,7 +28,9 @@
 #define CONFIG_BOARD_HAS_HSE            1
 #endif
 
-#define CLOCK_HSE                       MHZ(32)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE                       MHZ(32)
+#endif
 
 /* EXTAHB (HCLK2) max freq 32 Mhz*/
 #define CLOCK_EXTAHB_DIV    RCC_EXTCFGR_C2HPRE_3

diff --git a/boards/pyboard/Kconfig b/boards/pyboard/Kconfig
@@ -31,6 +31,9 @@ config BOARD_PYBOARD
 
     select HAVE_SAUL_GPIO
 
+config CLOCK_HSE
+    default 12000000
+
 config CLOCK_PLL_M
     default 12
 

diff --git a/boards/pyboard/include/periph_conf.h b/boards/pyboard/include/periph_conf.h
@@ -32,7 +32,9 @@
 #endif
 
 /* The HSE provides a 12MHz clock */
-#define CLOCK_HSE               MHZ(12)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(12)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/stm32f469i-disco/Kconfig b/boards/stm32f469i-disco/Kconfig
@@ -27,4 +27,7 @@ config BOARD_STM32F469I_DISCO
 
     select HAVE_SAUL_GPIO
 
+config CLOCK_HSE
+    default 8000000
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
diff --git a/boards/stm32f469i-disco/include/periph_conf.h b/boards/stm32f469i-disco/include/periph_conf.h
@@ -28,7 +28,9 @@
 #endif
 
 /* The HSE provides a 8MHz clock */
-#define CLOCK_HSE MHZ(8)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE MHZ(8)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/stm32f723e-disco/Kconfig b/boards/stm32f723e-disco/Kconfig
@@ -37,6 +37,9 @@ config BOARD_STM32F723E_DISCO
     # Workaround due to stdout only working with stdin enabled
     select MODULE_STDIN if TEST_KCONFIG
 
+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
@@ -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
diff --git a/boards/stm32f723e-disco/include/periph_conf.h b/boards/stm32f723e-disco/include/periph_conf.h
@@ -30,7 +30,9 @@
 #endif
 
 /* The HSE provides a 25MHz clock */
-#define CLOCK_HSE               MHZ(25)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(25)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/stm32f746g-disco/Kconfig b/boards/stm32f746g-disco/Kconfig
@@ -34,4 +34,9 @@ config BOARD_STM32F746G_DISCO
     select HAVE_STM32_ETH
     select HAVE_FT5X06
 
+
+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
@@ -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/stm32f746g-disco/include/periph_conf.h b/boards/stm32f746g-disco/include/periph_conf.h
@@ -30,7 +30,9 @@
 #endif
 
 /* The HSE provides a 25MHz clock */
-#define CLOCK_HSE               MHZ(25)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(25)
+#endif
 
 #include <stdint.h>
 

diff --git a/boards/stm32f7508-dk/Kconfig b/boards/stm32f7508-dk/Kconfig
@@ -31,6 +31,10 @@ config BOARD_STM32F7508_DK
     select BOARD_HAS_LSE
 
     select HAVE_SAUL_GPIO
+    select HAVE_STM32_ETH
     select HAVE_FT5X06
 
+config CLOCK_HSE
+    default 25000000
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
diff --git a/boards/stm32f769i-disco/Kconfig b/boards/stm32f769i-disco/Kconfig
@@ -29,4 +29,9 @@ config BOARD_STM32F769I_DISCO
 
     select HAVE_SAUL_GPIO
 
+
+config CLOCK_HSE
+    default 25000000
+
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
diff --git 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
diff --git a/boards/stm32f769i-disco/include/periph_conf.h b/boards/stm32f769i-disco/include/periph_conf.h
@@ -30,7 +30,9 @@
 #endif
 
 /* The HSE provides a 25MHz clock */
-#define CLOCK_HSE               MHZ(25)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(25)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

diff --git a/boards/ublox-c030-u201/Kconfig b/boards/ublox-c030-u201/Kconfig
@@ -30,4 +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
 
+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
@@ -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
diff --git a/boards/ublox-c030-u201/include/periph_conf.h b/boards/ublox-c030-u201/include/periph_conf.h
@@ -30,7 +30,9 @@
 #endif
 
 /* The HSE provides a 12MHz clock */
-#define CLOCK_HSE               MHZ(12)
+#ifndef CONFIG_CLOCK_HSE
+#define CONFIG_CLOCK_HSE               MHZ(12)
+#endif
 
 #include "periph_cpu.h"
 #include "clk_conf.h"

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