Merge pull request #17467 from MrKevinWeiss/pr/fix/kconfigblocklist

board/*/kconfig: Fix boards on kconfig blocklist
2024-12-29 04:50:03 +01:00 · 2022-02-02 08:58:31 +01:00 · 2022-02-02 08:58:31 +01:00 · 96dcc35f33
commit 96dcc35f33
parent 9b95605f78 68b1623d50
16 changed files with 86 additions and 43 deletions
--- a/.murdock
+++ b/.murdock
@ -105,27 +105,21 @@ tests/ieee802154_hal
 # As a rule of thumb, only add boards here if there are not differences in
 # modules or packages.
 # Eventually this list will be removed...
+#
+# msbiot and pyboard are on the list as kconfig tunes the pll due to different
+# HSE values from the standard, this is not the case in makefile.
 : ${TEST_KCONFIG_BOARD_BLOCKLIST:="
 6lowpan-clicker
-esp32-wrover-kit
-esp8266-esp-12x
-esp8266-olimex-mod
-esp8266-sparkfun-thing
-limifrog-v1
-lora-e5-dev
-msbiot
-msb-430h
-nucleo-l011k4
-nucleo-wl55jc
-omote
-openmote-b
 pic32-wifire
+
+esp32-wrover-kit
+esp8266-olimex-mod
+
+msbiot
 pyboard
-remote-pa
-samd10-xmini
-stk3200
-stm32f030f4-demo
-stm32f3discovery
+
+lora-e5-dev
+nucleo-wl55jc
 stm32mp157c-dk2
 "}

--- a/boards/esp32-wrover-kit/Makefile.features
+++ b/boards/esp32-wrover-kit/Makefile.features
@ -19,5 +19,5 @@ FEATURES_PROVIDED += arduino
 # This configuration enables modules that are only available when using Kconfig
 # module modelling
 ifeq (1, $(TEST_KCONFIG))
-  KCONFIG_ADD_CONFIG += $(BOARDDIR)/esp32-wrover-kit.config
+  KCONFIG_BOARD_CONFIG += $(BOARDDIR)/esp32-wrover-kit.config
 endif
--- a/boards/limifrog-v1/Kconfig
+++ b/boards/limifrog-v1/Kconfig
@ -19,4 +19,6 @@ config BOARD_LIMIFROG_V1
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select HAVE_LIS3MDL
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/msb-430h/Kconfig
+++ b/boards/msb-430h/Kconfig
@ -16,5 +16,6 @@ config BOARD_MSB_430H
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
    select BOARD_COMMON_MSB_430
+    select HAVE_SHT11

 source "$(RIOTBOARD)/common/msb-430/Kconfig"
--- a/boards/msbiot/Kconfig
+++ b/boards/msbiot/Kconfig
@ -27,4 +27,7 @@ config BOARD_MSBIOT
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

+    select HAVE_MPU9150
+    select HAVE_SAUL_GPIO
+
 source "$(RIOTBOARD)/common/stm32/Kconfig"
--- a/boards/omote/Kconfig
+++ b/boards/omote/Kconfig
@ -18,3 +18,7 @@ config BOARD_OMOTE
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
    select HAS_RIOTBOOT
+
+    select HAVE_SAUL_GPIO
+    select HAVE_BMP180
+    select HAVE_ADXL345
--- a/boards/openmote-b/Kconfig
+++ b/boards/openmote-b/Kconfig
@ -18,3 +18,6 @@ config BOARD_OPENMOTE_B
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
    select HAS_RIOTBOOT
+
+    select HAVE_SI7006
+    select HAVE_SAUL_GPIO
--- a/boards/remote-pa/Kconfig
+++ b/boards/remote-pa/Kconfig
@ -11,5 +11,7 @@ config BOARD_REMOTE_PA
    bool
    default y
    select BOARD_COMMON_REMOTE
+    select HAVE_SAUL_GPIO
+    select HAVE_SAUL_ADC

 source "$(RIOTBOARD)/common/remote/Kconfig"
--- a/boards/samd10-xmini/Kconfig
+++ b/boards/samd10-xmini/Kconfig
@ -20,3 +20,9 @@ config BOARD_SAMD10_XMINI
    select HAS_PERIPH_SPI
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
+    select HAVE_SAUL_GPIO
+
+choice LIBC_IMPLEMENTATION
+    # Use Picolibc to reduce ROM usage
+    default MODULE_PICOLIBC
+endchoice
--- a/boards/stk3200/Makefile.dep
+++ b/boards/stk3200/Makefile.dep
@ -3,9 +3,6 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
  USEMODULE += saul_gpio
 endif

-# limit the stack size so most tests and examples compile
-CFLAGS += -DTHREAD_STACKSIZE_DEFAULT=512
-
 # add board common drivers
 USEMODULE += boards_common_silabs
 USEMODULE += silabs_bc
--- a/boards/stk3200/Makefile.include
+++ b/boards/stk3200/Makefile.include
@ -1,5 +1,8 @@
 # setup JLink for flashing
 JLINK_PRE_FLASH = r

+# limit the stack size so most tests and examples compile
+CFLAGS += -DTHREAD_STACKSIZE_DEFAULT=512
+
 # include board common
 include $(RIOTBOARD)/common/silabs/Makefile.include
--- a/cpu/stm32/kconfigs/Kconfig.clk
+++ b/cpu/stm32/kconfigs/Kconfig.clk
@ -174,7 +174,7 @@ endif  # CPU_FAM_F2 || CPU_FAM_F4 || CPU_FAM_F7 || CPU_FAM_G0 || CPU_FAM_G4 || C
 if CPU_FAM_F0 || CPU_FAM_F1 || CPU_FAM_F3
 config CLOCK_PLL_PREDIV
    int "PLLIN division factor" if CUSTOM_PLL_PARAMS && !CPU_LINE_STM32F031X6 && !CPU_LINE_STM32F042X6 && !CPU_LINE_STM32F303X8
-    default 2 if CPU_LINE_STM32F031X6 || CPU_LINE_STM32F042X6 || CPU_LINE_STM32F303X8
+    default 2 if CPU_LINE_STM32F031X6 || CPU_LINE_STM32F042X6 || CPU_LINE_STM32F303X8 || CPU_LINE_STM32F303XC
    default 1
    range 1 16

--- a/drivers/adxl345/Kconfig
+++ b/drivers/adxl345/Kconfig
@ -10,3 +10,9 @@ config MODULE_ADXL345
    depends on HAS_PERIPH_I2C
    depends on TEST_KCONFIG
    select MODULE_PERIPH_I2C
+
+config HAVE_ADXL345
+    bool
+    select MODULE_ADXL345 if MODULE_SAUL_DEFAULT
+    help
+        Indicates that a adxl345 sensor is present.
--- a/drivers/bmp180/Kconfig
+++ b/drivers/bmp180/Kconfig
@ -12,3 +12,9 @@ config MODULE_BMP180
    select MODULE_PERIPH_I2C
    select MODULE_ZTIMER
    select MODULE_ZTIMER_MSEC
+
+config HAVE_BMP180
+    bool
+    select MODULE_BMP180 if MODULE_SAUL_DEFAULT
+    help
+        Indicates that a bmp180 sensor is present.
--- a/drivers/mpu9x50/Kconfig
+++ b/drivers/mpu9x50/Kconfig
@ -5,30 +5,46 @@
 # directory for more details.
 #

-if TEST_KCONFIG

-choice
-    bool "MPU-9X50 accelerometer/magnetometer/gyroscope"
-    optional
-    depends on HAS_PERIPH_I2C
-    help
-        This driver supports both MPU9150 and MPU9250. Choose one model.
-
-config MODULE_MPU9150
-    bool "MPU-9150"
-    select MODULE_MPU9X50
-
-config MODULE_MPU9250
-    bool "MPU-9250"
-    select MODULE_MPU9X50
-
-endchoice
-
-config MODULE_MPU9X50
+menuconfig MODULE_MPU9X50
    bool
+    prompt "MPU-9X50 accelerometer/magnetometer/gyroscope" if !(MODULE_SAUL_DEFAULT && HAVE_MPU9X50)
+    default y if (MODULE_SAUL_DEFAULT && HAVE_MPU9X50)
+    depends on TEST_KCONFIG
    depends on HAS_PERIPH_I2C
    select MODULE_PERIPH_I2C
    select MODULE_ZTIMER
    select MODULE_ZTIMER_MSEC

-endif # TEST_KCONFIG
+choice
+    bool "Sensor variant"
+    default MODULE_MPU9150 if HAVE_MPU9150
+    default MODULE_MPU9250 if HAVE_MPU9250
+    depends on MODULE_MPU9X50
+    help
+        This driver supports both MPU9150 and MPU9250. Choose one model.
+
+config MODULE_MPU9150
+    bool "MPU-9150"
+
+config MODULE_MPU9250
+    bool "MPU-9250"
+
+endchoice
+
+config HAVE_MPU9150
+    bool
+    select HAVE_MPU9X50
+    help
+      Indicates that a mpu9150 sensor is present.
+
+config HAVE_MPU9250
+    bool
+    select HAVE_MPU9X50
+    help
+      Indicates that a mpu9250 sensor is present.
+
+config HAVE_MPU9X50
+    bool
+    help
+      Indicates that a mpu9X50 sensor is present.
--- a/tests/driver_mpu9x50/app.config.test
+++ b/tests/driver_mpu9x50/app.config.test
@ -1,5 +1,5 @@
 # this file enables modules defined in Kconfig. Do not use this file for
 # application configuration. This is only needed during migration.
-CONFIG_MODULE_MPU9150=y
+CONFIG_MODULE_MPU9X50=y
 CONFIG_MODULE_ZTIMER=y
 CONFIG_MODULE_ZTIMER_MSEC=y