boards: Fix stm32 based boards kconfig models

2024-12-29 04:50:03 +01:00 · 2021-12-14 16:23:59 +01:00 · 2021-12-14 16:23:59 +01:00 · deda2cfb97
commit deda2cfb97
parent fbd404edfe
43 changed files with 133 additions and 17 deletions
--- a/boards/alientek-pandora/Kconfig
+++ b/boards/alientek-pandora/Kconfig
@ -25,4 +25,6 @@ config BOARD_ALIENTEK_PANDORA
    # Clock configuration
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/b-l072z-lrwan1/Kconfig
+++ b/boards/b-l072z-lrwan1/Kconfig
@ -32,4 +32,6 @@ config BOARD_B_L072Z_LRWAN1
    # Clock configuration
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/b-l475e-iot01a/Kconfig
+++ b/boards/b-l475e-iot01a/Kconfig
@ -30,4 +30,10 @@ config BOARD_B_L475E_IOT01A
    # Clock configuration
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+    select HAVE_HTS221
+    select HAVE_LIS3MDL
+    select HAVE_LPS22HB
+    select HAVE_LSM6DSL
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/blackpill-128kib/Kconfig
+++ b/boards/blackpill-128kib/Kconfig
@ -13,5 +13,6 @@ config BOARD_BLACKPILL_128KIB
    default y
    select BOARD_COMMON_BLXXXPILL
    select CPU_MODEL_STM32F103CB
+    select MODULE_BOARDS_COMMON_BLXXXPILL if TEST_KCONFIG

 source "$(RIOTBOARD)/common/blxxxpill/Kconfig"
--- a/boards/blackpill/Kconfig
+++ b/boards/blackpill/Kconfig
@ -13,5 +13,6 @@ config BOARD_BLACKPILL
    default y
    select BOARD_COMMON_BLXXXPILL
    select CPU_MODEL_STM32F103C8
+    select MODULE_BOARDS_COMMON_BLXXXPILL if TEST_KCONFIG

 source "$(RIOTBOARD)/common/blxxxpill/Kconfig"
--- a/boards/bluepill-128kib/Kconfig
+++ b/boards/bluepill-128kib/Kconfig
@ -13,5 +13,6 @@ config BOARD_BLUEPILL_128KIB
    default y
    select BOARD_COMMON_BLXXXPILL
    select CPU_MODEL_STM32F103CB
+    select MODULE_BOARDS_COMMON_BLXXXPILL if TEST_KCONFIG

 source "$(RIOTBOARD)/common/blxxxpill/Kconfig"
--- a/boards/bluepill-stm32f030c8/Kconfig
+++ b/boards/bluepill-stm32f030c8/Kconfig
@ -21,3 +21,5 @@ config BOARD_BLUEPILL_STM32F030C8
    select HAS_PERIPH_UART
    select HAS_PERIPH_SPI
    select HAS_PERIPH_RTC
+
+    select HAVE_SAUL_GPIO
--- a/boards/bluepill/Kconfig
+++ b/boards/bluepill/Kconfig
@ -13,5 +13,6 @@ config BOARD_BLUEPILL
    default y
    select BOARD_COMMON_BLXXXPILL
    select CPU_MODEL_STM32F103C8
+    select MODULE_BOARDS_COMMON_BLXXXPILL if TEST_KCONFIG

 source "$(RIOTBOARD)/common/blxxxpill/Kconfig"
--- a/boards/common/blxxxpill/Kconfig
+++ b/boards/common/blxxxpill/Kconfig
@ -22,4 +22,13 @@ config BOARD_COMMON_BLXXXPILL
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
+config MODULE_BOARDS_COMMON_BLXXXPILL
+    bool
+    depends on TEST_KCONFIG
+    help
+       Common code of bluepill or blackpill boards
+
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/common/iotlab/Kconfig
+++ b/boards/common/iotlab/Kconfig
@ -22,4 +22,14 @@ config BOARD_COMMON_IOTLAB
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+    select HAVE_L3G4200D
+    select HAVE_LSM303DLHC
+
+config MODULE_BOARDS_COMMON_IOTLAB
+    bool
+    depends on TEST_KCONFIG
+    help
+       Common code of iotlab based boards
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/common/weact-f4x1cx/Kconfig
+++ b/boards/common/weact-f4x1cx/Kconfig
@ -5,7 +5,7 @@
 # directory for more details.
 #

-config BOARD_COMMON_WEACT_F41XCX
+config BOARD_COMMON_WEACT_F4X1CX
    bool
    # Put defined MCU peripherals here (in alphabetical order)
    select HAS_PERIPH_ADC
@ -22,4 +22,13 @@ config BOARD_COMMON_WEACT_F41XCX
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+    select HAVE_MTD_SPI_NOR
+
+config MODULE_BOARDS_COMMON_WEACT-F4X1CX
+    bool
+    depends on TEST_KCONFIG
+    help
+       Common code of weact based boards
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/common/weact-f4x1cx/Makefile.features
+++ b/boards/common/weact-f4x1cx/Makefile.features
@ -15,3 +15,9 @@ FEATURES_PROVIDED += highlevel_stdio

 # 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
+ifeq (1, $(TEST_KCONFIG))
+  KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/common/weact-f4x1cx/weact-f4x1cx.config
+endif
--- a/boards/common/weact-f4x1cx/weact-f4x1cx.config
+++ b/boards/common/weact-f4x1cx/weact-f4x1cx.config
@ -0,0 +1,5 @@
+CONFIG_MODULE_BOOTLOADER_STM32=y
+CONFIG_MODULE_STDIO_CDC_ACM=y
+CONFIG_MODULE_USBUS=y
+CONFIG_MODULE_USBUS_CDC_ACM=y
+CONFIG_MODULE_USB_BOARD_RESET=y
--- a/boards/iotlab-a8-m3/Kconfig
+++ b/boards/iotlab-a8-m3/Kconfig
@ -12,5 +12,6 @@ config BOARD_IOTLAB_A8_M3
    bool
    default y
    select BOARD_COMMON_IOTLAB
+    select MODULE_BOARDS_COMMON_IOTLAB if TEST_KCONFIG

 source "$(RIOTBOARD)/common/iotlab/Kconfig"
--- a/boards/iotlab-m3/Kconfig
+++ b/boards/iotlab-m3/Kconfig
@ -14,5 +14,9 @@ config BOARD_IOTLAB_M3
    select BOARD_COMMON_IOTLAB

    select HAS_PERIPH_DMA
+    select HAVE_MTD_SPI_NOR
+    select HAVE_LPS331AP
+    select HAVE_ISL29020
+    select MODULE_BOARDS_COMMON_IOTLAB if TEST_KCONFIG

 source "$(RIOTBOARD)/common/iotlab/Kconfig"
--- a/boards/lobaro-lorabox/Kconfig
+++ b/boards/lobaro-lorabox/Kconfig
@ -24,4 +24,6 @@ config BOARD_LOBARO_LORABOX
    # Clock configuration
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/lora-e5-dev/Kconfig
+++ b/boards/lora-e5-dev/Kconfig
@ -25,6 +25,9 @@ config BOARD_LORA_E5_DEV
    # Put other features for this board (in alphabetical order)
    select HAS_RIOTBOOT

+    select HAVE_SAUL_GPIO
+    select HAVE_LM75A
+
 config LORA_E5_DEV_ENABLE_3P3V
    bool "LoRa-E5 Development Kit - Enable 3.3V output"
    default y
--- a/boards/nucleo-l011k4/Kconfig
+++ b/boards/nucleo-l011k4/Kconfig
@ -23,4 +23,9 @@ config BOARD_NUCLEO_L011K4
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+choice LIBC_IMPLEMENTATION
+    # Use Picolibc to reduce ROM usage
+    default MODULE_PICOLIBC
+endchoice
+
 source "$(RIOTBOARD)/common/nucleo32/Kconfig"
--- a/boards/nucleo-wl55jc/Kconfig
+++ b/boards/nucleo-wl55jc/Kconfig
@ -26,4 +26,6 @@ config BOARD_NUCLEO_WL55JC
    select HAS_ARDUINO
    select HAS_RIOTBOOT

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
 source "$(RIOTBOARD)/common/nucleo64/Kconfig"
--- a/boards/nz32-sc151/Kconfig
+++ b/boards/nz32-sc151/Kconfig
@ -24,4 +24,6 @@ config BOARD_NZ32_SC151
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/olimexino-stm32/Kconfig
+++ b/boards/olimexino-stm32/Kconfig
@ -28,4 +28,6 @@ config BOARD_OLIMEXINO_STM32
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/p-l496g-cell02/Kconfig
+++ b/boards/p-l496g-cell02/Kconfig
@ -26,4 +26,6 @@ config BOARD_P_L496G_CELL02
    # Clock configuration
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/pyboard/Kconfig
+++ b/boards/pyboard/Kconfig
@ -26,4 +26,6 @@ config BOARD_PYBOARD
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f030f4-demo/Kconfig
+++ b/boards/stm32f030f4-demo/Kconfig
@ -24,4 +24,9 @@ config BOARD_STM32F030F4_DEMO
    # Clock configuration
    select BOARD_HAS_HSE

+choice LIBC_IMPLEMENTATION
+    # Use Picolibc to reduce ROM usage
+    default MODULE_PICOLIBC
+endchoice
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f0discovery/Kconfig
+++ b/boards/stm32f0discovery/Kconfig
@ -23,4 +23,6 @@ config BOARD_STM32F0DISCOVERY
    # Clock configuration
    select BOARD_HAS_HSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f3discovery/Kconfig
+++ b/boards/stm32f3discovery/Kconfig
@ -25,4 +25,7 @@ config BOARD_STM32F3DISCOVERY
    # Clock configuration
    select BOARD_HAS_HSE

+    select HAVE_SAUL_GPIO
+    select HAVE_LSM303DLHC
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f429i-disc1/Kconfig
+++ b/boards/stm32f429i-disc1/Kconfig
@ -28,4 +28,6 @@ config BOARD_STM32F429I_DISC1
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f429i-disco/Kconfig
+++ b/boards/stm32f429i-disco/Kconfig
@ -13,20 +13,8 @@ config BOARD_STM32F429I_DISCO
    default y
    select CPU_MODEL_STM32F429ZI

-    # Put defined MCU peripherals here (in alphabetical order)
-    select HAS_PERIPH_DMA
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_TIMER
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-
    # Put other features for this board (in alphabetical order)
    select HAS_HIGHLEVEL_STDIO
-    select HAS_RIOTBOOT
-
-    # Clock configuration
-    select BOARD_HAS_HSE
-    select BOARD_HAS_LSE

 source "$(RIOTBOARD)/common/stm32/Kconfig"
+source "$(RIOTBOARD)/stm32f429i-disc1/Kconfig"
--- a/boards/stm32f429i-disco/Makefile.features
+++ b/boards/stm32f429i-disco/Makefile.features
@ -1,3 +1,9 @@
 FEATURES_PROVIDED += highlevel_stdio

 include $(RIOTBOARD)/stm32f429i-disc1/Makefile.features
+
+# This configuration enables modules that are only available when using Kconfig
+# module modelling
+ifeq (1, $(TEST_KCONFIG))
+  KCONFIG_ADD_CONFIG += $(BOARDDIR)/stm32f429i-disco.config
+endif
--- a/boards/stm32f429i-disco/stm32f429i-disco.config
+++ b/boards/stm32f429i-disco/stm32f429i-disco.config
@ -0,0 +1,3 @@
+CONFIG_MODULE_USBUS=y
+CONFIG_MODULE_USBUS_CDC_ACM=y
+CONFIG_MODULE_STDIO_CDC_ACM=y
--- a/boards/stm32f469i-disco/Kconfig
+++ b/boards/stm32f469i-disco/Kconfig
@ -22,4 +22,6 @@ config BOARD_STM32F469I_DISCO
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f4discovery/Kconfig
+++ b/boards/stm32f4discovery/Kconfig
@ -31,6 +31,8 @@ config BOARD_STM32F4DISCOVERY
    # Clock configuration
    select BOARD_HAS_HSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"

 config ERROR_MODULES_CONFLICT
--- a/boards/stm32f723e-disco/Kconfig
+++ b/boards/stm32f723e-disco/Kconfig
@ -20,10 +20,16 @@ config BOARD_STM32F723E_DISCO
    select HAS_PERIPH_SPI
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
+    select HAS_PERIPH_UART_HW_FC
    select HAS_PERIPH_USBDEV

    # Clock configuration
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+    select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC
+    # Workaround due to stdout only working with stdin enabled
+    select MODULE_STDIN if TEST_KCONFIG
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f723e-disco/Makefile.features
+++ b/boards/stm32f723e-disco/Makefile.features
@ -9,6 +9,7 @@ FEATURES_PROVIDED += periph_rtt
 FEATURES_PROVIDED += periph_spi
 FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart
+FEATURES_PROVIDED += periph_uart_hw_fc
 FEATURES_PROVIDED += periph_usbdev

 # stm32f723e-disco provides a custom default Kconfig clock configuration
--- a/boards/stm32f746g-disco/Kconfig
+++ b/boards/stm32f746g-disco/Kconfig
@ -27,4 +27,6 @@ config BOARD_STM32F746G_DISCO
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32f769i-disco/Kconfig
+++ b/boards/stm32f769i-disco/Kconfig
@ -24,4 +24,6 @@ config BOARD_STM32F769I_DISCO
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32l0538-disco/Kconfig
+++ b/boards/stm32l0538-disco/Kconfig
@ -19,4 +19,6 @@ config BOARD_STM32L0538_DISCO
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/stm32l476g-disco/Kconfig
+++ b/boards/stm32l476g-disco/Kconfig
@ -26,4 +26,6 @@ config BOARD_STM32L476G_DISCO
    # Clock configuration
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/ublox-c030-u201/Kconfig
+++ b/boards/ublox-c030-u201/Kconfig
@ -21,9 +21,13 @@ config BOARD_UBLOX_C030_U201
    select HAS_PERIPH_SPI
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
+    select HAS_PERIPH_UART_HW_FC

    # Clock configuration
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_SAUL_GPIO
+    select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/ublox-c030-u201/Makefile.features
+++ b/boards/ublox-c030-u201/Makefile.features
@ -9,6 +9,7 @@ FEATURES_PROVIDED += periph_rtc
 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
--- a/boards/weact-f401cc/Kconfig
+++ b/boards/weact-f401cc/Kconfig
@ -11,7 +11,8 @@ config BOARD
 config BOARD_WEACT_F401CC
    bool
    default y
-    select BOARD_COMMON_WEACT_F41XCX
+    select BOARD_COMMON_WEACT_F4X1CX
    select CPU_MODEL_STM32F401CC
+    select MODULE_BOARDS_COMMON_WEACT-F4X1CX if TEST_KCONFIG

 source "$(RIOTBOARD)/common/weact-f4x1cx/Kconfig"
--- a/boards/weact-f401ce/Kconfig
+++ b/boards/weact-f401ce/Kconfig
@ -11,7 +11,8 @@ config BOARD
 config BOARD_WEACT_F401CE
    bool
    default y
-    select BOARD_COMMON_WEACT_F41XCX
+    select BOARD_COMMON_WEACT_F4X1CX
    select CPU_MODEL_STM32F401CE
+    select MODULE_BOARDS_COMMON_WEACT-F4X1CX if TEST_KCONFIG

 source "$(RIOTBOARD)/common/weact-f4x1cx/Kconfig"
--- a/boards/weact-f411ce/Kconfig
+++ b/boards/weact-f411ce/Kconfig
@ -11,7 +11,8 @@ config BOARD
 config BOARD_WEACT_F411CE
    bool
    default y
-    select BOARD_COMMON_WEACT_F41XCX
+    select BOARD_COMMON_WEACT_F4X1CX
    select CPU_MODEL_STM32F411CE
+    select MODULE_BOARDS_COMMON_WEACT-F4X1CX if TEST_KCONFIG

 source "$(RIOTBOARD)/common/weact-f4x1cx/Kconfig"