Merge pull request #16845 from MrKevinWeiss/pr/kconfig/supportstms

.murdock: Add nucleo boards to kconfig test
2024-12-29 04:50:03 +01:00 · 2021-11-01 09:55:22 +01:00 · 2021-11-01 09:55:22 +01:00 · f64b166319
commit f64b166319
parent 4011bd9edf 9b6a63a951
25 changed files with 101 additions and 18 deletions
--- a/.murdock
+++ b/.murdock
@ -12,7 +12,19 @@ dwm1001
 hifive1
 native
 nrf52840dk
+nucleo-f072rb
 nucleo-f103rb
+nucleo-f207zg
+nucleo-f334r8
+nucleo-f429zi
+nucleo-f767zi
+nucleo-g071rb
+nucleo-g474re
+nucleo-l073rz
+nucleo-l152re
+nucleo-l433rc
+nucleo-l552ze-q
+p-nucleo-wb55
 remote-revb
 samr21-xpro
 seeedstudio-gd32
--- a/boards/common/nucleo/Kconfig
+++ b/boards/common/nucleo/Kconfig
@ -10,8 +10,10 @@ if TEST_KCONFIG
 config MODULE_BOARDS_COMMON_NUCLEO
    bool
    default y
-    select MODULE_SAUL_GPIO if MODULE_SAUL_DEFAULT && HAS_PERIPH_GPIO
+    select HAVE_SAUL_GPIO
    help
        stm32 common nucleo code.

 endif # TEST_KCONFIG
+
+rsource "../stm32/Kconfig"
--- a/boards/i-nucleo-lrwan1/Kconfig
+++ b/boards/i-nucleo-lrwan1/Kconfig
@ -23,6 +23,8 @@ config BOARD_I_NUCLEO_LRWAN1
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Clock configuration
    select BOARD_HAS_LSE

--- a/boards/nucleo-g431rb/Kconfig
+++ b/boards/nucleo-g431rb/Kconfig
@ -24,6 +24,8 @@ config BOARD_NUCLEO_G431RB
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Put other features for this board (in alphabetical order)
    select HAS_RIOTBOOT

--- a/boards/nucleo-g474re/Kconfig
+++ b/boards/nucleo-g474re/Kconfig
@ -23,6 +23,8 @@ config BOARD_NUCLEO_G474RE
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Put other features for this board (in alphabetical order)
    select HAS_RIOTBOOT

--- a/boards/nucleo-l433rc/Kconfig
+++ b/boards/nucleo-l433rc/Kconfig
@ -24,6 +24,8 @@ config BOARD_NUCLEO_L433RC
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Put other features for this board (in alphabetical order)
    # Note that a recent version of OpenOCD is required for flashing an image on
    # the second slot of the flash memory. This version has to be built from source
--- a/boards/nucleo-l496zg/Kconfig
+++ b/boards/nucleo-l496zg/Kconfig
@ -24,6 +24,8 @@ config BOARD_NUCLEO_L496ZG
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Put other features for this board (in alphabetical order)
    select HAS_RIOTBOOT

--- a/boards/nucleo-l4r5zi/Kconfig
+++ b/boards/nucleo-l4r5zi/Kconfig
@ -23,6 +23,8 @@ config BOARD_NUCLEO_L4R5ZI
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Put other features for this board (in alphabetical order)
    select HAS_RIOTBOOT

--- a/boards/nucleo-l552ze-q/Kconfig
+++ b/boards/nucleo-l552ze-q/Kconfig
@ -21,6 +21,8 @@ config BOARD_NUCLEO_L552ZE_Q
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART

+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART
+
    # Put other features for this board (in alphabetical order)
    select HAS_RIOTBOOT

--- a/boards/p-nucleo-wb55/Kconfig
+++ b/boards/p-nucleo-wb55/Kconfig
@ -21,6 +21,7 @@ config BOARD_P_NUCLEO_WB55
    select HAS_PERIPH_SPI
    select HAS_PERIPH_TIMER
    select HAS_PERIPH_UART
+    select MODULE_PERIPH_LPUART if MODULE_STDIO_UART && HAS_PERIPH_LPUART

    # Put other features for this board (in alphabetical order)
    select HAS_ARDUINO
@ -30,4 +31,4 @@ config BOARD_P_NUCLEO_WB55
    select BOARD_HAS_HSE
    select BOARD_HAS_LSE

-source "$(RIOTBOARD)/common/stm32/Kconfig"
+source "$(RIOTBOARD)/common/nucleo/Kconfig"
--- a/cpu/efm32/Kconfig
+++ b/cpu/efm32/Kconfig
@ -16,6 +16,7 @@ config CPU_COMMON_EFM32
    select HAS_PERIPH_RTT_SET_COUNTER
    select HAS_PERIPH_RTT_OVERFLOW
    select HAS_PERIPH_WDT
+    select HAVE_SHARED_PERIPH_RTT_PERIPH_RTC

 config CPU_EFM32_SERIES0
    bool
@ -45,9 +46,5 @@ config HAS_EFM32_CORETEMP
 config CPU
    default "efm32" if CPU_COMMON_EFM32

-config ERROR_MODULES_CONFLICT
-    default "On the EFM32, the RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
-    depends on CPU_COMMON_EFM32
-
 orsource "families/*/Kconfig"
 source "$(RIOTCPU)/cortexm_common/Kconfig"
--- a/cpu/sam0_common/Kconfig
+++ b/cpu/sam0_common/Kconfig
@ -25,14 +25,12 @@ config CPU_COMMON_SAM0
    select HAS_PERIPH_WDT
    select HAS_PERIPH_WDT_CB
    select HAS_PERIPH_WDT_WARNING_PERIOD
+    select HAVE_SHARED_PERIPH_RTT_PERIPH_RTC

 if CPU_COMMON_SAM0

 rsource "periph/Kconfig"

-config ERROR_MODULES_CONFLICT
-    default "On SAM0, the RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
-
 endif # CPU_COMMON_SAM0

 source "$(RIOTCPU)/cortexm_common/Kconfig"
--- a/cpu/stm32/Kconfig
+++ b/cpu/stm32/Kconfig
@ -16,6 +16,9 @@ config CPU_STM32
    select HAS_PERIPH_UART_MODECFG
    select HAS_PERIPH_UART_NONBLOCKING

+    # This CPU requires periph_rtc when periph_rtc_mem
+    select MODULE_PERIPH_RTC if MODULE_PERIPH_RTC_MEM && HAS_PERIPH_RTC
+
 # Common CPU symbol
 config CPU
    default "stm32" if CPU_STM32
--- a/cpu/stm32/kconfigs/f1/Kconfig
+++ b/cpu/stm32/kconfigs/f1/Kconfig
@ -17,15 +17,13 @@ config CPU_FAM_F1
    select HAS_PERIPH_FLASHPAGE_RAW
    select HAS_PERIPH_RTT_SET_COUNTER
    select HAS_PERIPH_WDT
+    select HAVE_SHARED_PERIPH_RTT_PERIPH_RTC

 if CPU_FAM_F1

 config CPU_FAM
    default "f1"

-config ERROR_MODULES_CONFLICT
-    default "On STM32F1, the RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
-
 endif # CPU_FAM_F1

 config HAS_CPU_STM32F1
--- a/doc/doxygen/src/kconfig/kconfig.md
+++ b/doc/doxygen/src/kconfig/kconfig.md
@ -475,6 +475,7 @@ reserved for the cases described below:
 | `HAS_` | Models a [feature](build-system-basics.html#features) |
 | `KCONFIG_USEMODULE_` | Used during transition to enable configuration of a module via Kconfig |
 | `KCONFIG_USEPKG_` | Used during transition to enable configuration of a package via Kconfig |
+| `HAVE_` | Models a feature not present in makefiles, will be unified in the future |
 | `USEMODULE_` | Models a [RIOT module](creating-modules.html#creating-modules). Generated from `USEMODULE` variable |
 | `USEPKG_` | Models an [external package](group__pkg.html). Generated from `USEPKG` variable |

--- a/drivers/periph_common/Kconfig
+++ b/drivers/periph_common/Kconfig
@ -126,6 +126,11 @@ config MODULE_PERIPH_RTT_SET_COUNTER
    bool "rtc_set_counter() implementation in the RTT peripheral driver"
    depends on HAS_PERIPH_RTT_SET_COUNTER && MODULE_PERIPH_RTT

+config MODULE_PERIPH_INIT_RTT_SET_COUNTER
+    bool "Auto initialize rtc_set_counter() with RTT"
+    default y if MODULE_PERIPH_INIT
+    depends on MODULE_PERIPH_RTT_SET_COUNTER
+
 config MODULE_PERIPH_INIT_RTT
    bool "Auto initialize RTT peripheral"
    default y if MODULE_PERIPH_INIT
@ -157,5 +162,11 @@ config MODULE_PERIPH_INIT_USBDEV

 endif # TEST_KCONFIG

+config HAVE_SHARED_PERIPH_RTT_PERIPH_RTC
+    bool
+    help
+        The periph_rtc module or the periph_rtt module share hardware, thus,
+        only one can be selected.
+
 rsource "Kconfig.timer"
 rsource "Kconfig.wdt"
--- a/drivers/periph_common/Kconfig.rtc
+++ b/drivers/periph_common/Kconfig.rtc
@ -15,5 +15,21 @@ config MODULE_PERIPH_INIT_RTC
    default y if MODULE_PERIPH_INIT
    depends on MODULE_PERIPH_RTC

+config MODULE_PERIPH_RTC_MEM
+    bool "Low-Power RTC Memory"
+    depends on HAS_PERIPH_RTC_MEM
+    help
+        Provides an interface to access low-power memory present on some RTCs.
+        This memory is retained even when the rest of the system is powered off.
+
+# TODO: this module is actually just an artifact from the way periph_init_%
+# modules are handled in Makefile. We need to define it to keep the list the
+# same for now. We should be able to remove it later on.
+
+config MODULE_PERIPH_INIT_RTC_MEM
+    bool
+    default y if MODULE_PERIPH_INIT
+    depends on MODULE_PERIPH_RTC_MEM
+
 # Include CPU specific configurations
 osource "$(RIOTCPU)/$(CPU)/periph/Kconfig.rtc"
--- a/drivers/periph_common/Kconfig.spi
+++ b/drivers/periph_common/Kconfig.spi
@ -20,13 +20,25 @@ config MODULE_PERIPH_SPI_RECONFIGURE
    bool "Pin reconfiguration support"
    depends on HAS_PERIPH_SPI_RECONFIGURE

-# TODO: this module is actually just an artifact from the way periph_init_%
-# modules are handled in Makefile. We need to define it to keep the list the
-# same for now. We should be able to remove it later on.
+config MODULE_PERIPH_SPI_GPIO_MODE
+    bool "Support initializing SPI pins with adapted GPIO modes"
+    depends on HAS_PERIPH_SPI_GPIO_MODE
+    help
+        Say y to call `spi_init_with_gpio_mode`, which allows to initialize the SPI pins in
+        with an specific GPIO mode.
+
+# TODO: these modules are actually just artifacts from the way periph_init_%
+# modules are handled in Makefile. We need to define them to keep the list the
+# same for now. We should be able to remove them later on.

 config MODULE_PERIPH_INIT_SPI_RECONFIGURE
    bool "Auto initialize SPI pin reconfiguration support"
    default y if MODULE_PERIPH_INIT
    depends on MODULE_PERIPH_SPI_RECONFIGURE

+config MODULE_PERIPH_INIT_SPI_GPIO_MODE
+    bool
+    default y if MODULE_PERIPH_INIT
+    depends on MODULE_PERIPH_SPI_GPIO_MODE
+
 endif # MODULE_PERIPH_SPI
--- a/kconfigs/Kconfig.errors
+++ b/kconfigs/Kconfig.errors
@ -15,6 +15,7 @@

 config ERROR_MODULES_CONFLICT
    string
+    default "The RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT && HAVE_SHARED_PERIPH_RTT_PERIPH_RTC
    help
        Used to indicate that conflicting modules (i.e. modules that can't be
        active at the same time) are being used together.
--- a/sys/arduino/Kconfig
+++ b/sys/arduino/Kconfig
@ -29,6 +29,7 @@ menuconfig MODULE_ARDUINO
 config MODULE_ARDUINO_PWM
    bool "PWM support for Arduino"
    depends on HAS_PERIPH_PWM
+    depends on HAS_ARDUINO_PWM
    depends on MODULE_ARDUINO
    depends on TEST_KCONFIG
    select MODULE_PERIPH_PWM
--- a/sys/ztimer/Kconfig
+++ b/sys/ztimer/Kconfig
@ -75,9 +75,7 @@ choice
    bool "Backend"
    depends on MODULE_ZTIMER_SEC
    default ZTIMER_SEC_BACKEND_RTC if !BOARD_NATIVE && \
-                                      !CPU_COMMON_SAM0 && \
-                                      !CPU_COMMON_EFM32 && \
-                                      !CPU_FAM_F1
+                                      !HAVE_SHARED_PERIPH_RTT_PERIPH_RTC
    default ZTIMER_SEC_BACKEND_RTT

 config ZTIMER_SEC_BACKEND_TIMER
--- a/tests/periph_rtc/Kconfig
+++ b/tests/periph_rtc/Kconfig
@ -0,0 +1,11 @@
+# Copyright (c) 2021 HAW Hamburg
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+#
+
+config APPLICATION
+    bool
+    default y
+    imply MODULE_PERIPH_RTC_MEM
--- a/tests/periph_rtc/Makefile
+++ b/tests/periph_rtc/Makefile
@ -8,4 +8,7 @@ DISABLE_MODULE += periph_init_rtc

 USEMODULE += xtimer

+# avoid running Kconfig by default
+SHOULD_RUN_KCONFIG ?=
+
 include $(RIOTBASE)/Makefile.include
--- a/tests/periph_rtt/Kconfig
+++ b/tests/periph_rtt/Kconfig
@ -9,4 +9,5 @@ config APPLICATION
    bool
    default y
    imply MODULE_PERIPH_RTT_SET_COUNTER
+    imply MODULE_PERIPH_RTC_MEM
    depends on TEST_KCONFIG
--- a/tests/periph_rtt/Makefile
+++ b/tests/periph_rtt/Makefile
@ -7,6 +7,9 @@ FEATURES_OPTIONAL += periph_rtc_mem

 DISABLE_MODULE += periph_init_rtt

+# avoid running Kconfig by default
+SHOULD_RUN_KCONFIG ?=
+
 include $(RIOTBASE)/Makefile.include

 # Put board specific dependencies here