cpu/avr8: model kconfig

.murdock

@@ -8,11 +8,19 @@
 : ${TEST_BOARDS_LLVM_COMPILE:=""}
 
 : ${TEST_KCONFIG_BOARDS_AVAILABLE:="
+arduino-leonardo
+arduino-mega2560
+arduino-nano
+atxmega-a1-xplained
+atxmega-a3bu-xplained
+avr-rss2
 cc1352-launchpad
 cc2650-launchpad
+derfmega128
 dwm1001
 hifive1
 mbed_lpc1768
+mega-xplained
 native
 nrf52840dk
 nucleo-f072rb
@@ -34,6 +42,7 @@ seeedstudio-gd32
 slstk3400a
 sltb001a
 slwstk6220a
+waspmote-pro
 "}
 
 : ${TEST_KCONFIG_ENFORCE_APP_GROUPS:="

Makefile.include

@@ -47,6 +47,7 @@ RIOTCPU                         ?= $(RIOTBASE)/cpu
 RIOTBOARD                       ?= $(RIOTBASE)/boards
 EXTERNAL_BOARD_DIRS             ?=
 RIOTMAKE                        ?= $(RIOTBASE)/makefiles
+RIOTKCONFIG                     ?= $(RIOTBASE)/kconfigs
 RIOTPKG                         ?= $(RIOTBASE)/pkg
 RIOTTOOLS                       ?= $(RIOTBASE)/dist/tools
 RIOTPROJECT                     ?= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd)

boards/arduino-duemilanove/Kconfig

@@ -9,6 +9,7 @@ config BOARD_ARDUINO_DUEMILANOVE
     default y
     select BOARD_COMMON_ARDUINO_ATMEGA
     select CPU_MODEL_ATMEGA328P
+    select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
 
 config BOARD
     default "arduino-duemilanove" if BOARD_ARDUINO_DUEMILANOVE

boards/arduino-leonardo/Kconfig

@@ -12,5 +12,6 @@ config BOARD_ARDUINO_LEONARDO
     default y
     select BOARD_COMMON_ARDUINO_ATMEGA
     select CPU_MODEL_ATMEGA32U4
+    select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/arduino-atmega/Kconfig"

boards/arduino-mega2560/Kconfig

@@ -12,5 +12,6 @@ config BOARD_ARDUINO_MEGA2560
     default y
     select CPU_MODEL_ATMEGA2560
     select BOARD_COMMON_ARDUINO_ATMEGA
+    select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/arduino-atmega/Kconfig"

boards/arduino-nano/Kconfig

@@ -9,6 +9,7 @@ config BOARD_ARDUINO_NANO
     default y
     select BOARD_COMMON_ARDUINO_ATMEGA
     select CPU_MODEL_ATMEGA328P
+    select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
 
 config BOARD
     default "arduino-nano" if BOARD_ARDUINO_NANO

boards/arduino-uno/Kconfig

@@ -9,6 +9,7 @@ config BOARD_ARDUINO_UNO
     default y
     select CPU_MODEL_ATMEGA328P
     select BOARD_COMMON_ARDUINO_ATMEGA
+    select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
 
 config BOARD
     default "arduino-uno" if BOARD_ARDUINO_UNO

boards/atmega1284p/Kconfig

@@ -19,3 +19,7 @@ config BOARD_ATMEGA1284P
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/atmega256rfr2-xpro/Kconfig

@@ -18,3 +18,9 @@ config BOARD_ATMEGA256RFR2_XPRO
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select HAVE_SAUL_GPIO
+    select HAVE_AT30TSE75X
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/atmega328p-xplained-mini/Kconfig

@@ -22,3 +22,6 @@ config BOARD_ATMEGA328P_XPLAINED_MINI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
     # Various other features (if any)
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/atmega328p/Kconfig

@@ -21,3 +21,6 @@ config BOARD_ATMEGA328P
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
     # Various other features (if any)
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/atxmega-a1-xplained/Kconfig

@@ -18,3 +18,6 @@ config BOARD_ATXMEGA_A1_XPLAINED
     select HAS_PERIPH_UART
 
     select HAVE_SAUL_GPIO
+    select MODULE_BOARDS_COMMON_ATXMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atxmega/Kconfig"

boards/atxmega-a1u-xpro/Kconfig

@@ -18,3 +18,6 @@ config BOARD_ATXMEGA_A1U_XPRO
     select HAS_PERIPH_UART
 
     select HAVE_SAUL_GPIO
+    select MODULE_BOARDS_COMMON_ATXMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atxmega/Kconfig"

boards/atxmega-a3bu-xplained/Kconfig

@@ -18,3 +18,6 @@ config BOARD_ATXMEGA_A3BU_XPLAINED
     select HAS_PERIPH_UART
 
     select HAVE_SAUL_GPIO
+    select MODULE_BOARDS_COMMON_ATXMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atxmega/Kconfig"

boards/avr-rss2/Kconfig

@@ -18,3 +18,12 @@ config BOARD_AVR_RSS2
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+    select MODULE_ATMEGA_PCINT0 if TEST_KCONFIG
+    select HAVE_SAUL_GPIO
+    select HAVE_BME280_I2C
+    select HAVE_AT24MAC
+
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/common/arduino-atmega/Kconfig

@@ -16,3 +16,14 @@ config BOARD_COMMON_ARDUINO_ATMEGA
     # Various other features (if any)
     select HAS_ARDUINO
     select HAS_ARDUINO_PWM
+
+    select HAVE_SAUL_GPIO
+
+config MODULE_BOARDS_COMMON_ARDUINO-ATMEGA
+    bool
+    depends on TEST_KCONFIG
+    select MODULE_BOARDS_COMMON_ATMEGA
+    help
+       Common code of Arduino ATmega boards.
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/common/atmega/Kconfig

@@ -0,0 +1,12 @@
+# 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 MODULE_BOARDS_COMMON_ATMEGA
+    bool
+    depends on TEST_KCONFIG
+    help
+        Common code of ATmega boards.

boards/common/atmega/doc.txt

@@ -1,17 +1,5 @@
 /**
-@defgroup    boards_common_atmega ATmega common
-@ingroup     boards
-@brief       Shared files and configuration for ATmega-based boards
-
-### Pin Change Interrupts
-
-Pin Change Interrupts (PCINTs) can be enabled using pseudo modules. To provide
-a low-memory overhead implementation, the PCINTs are grouped into **banks**.
-Each banks corresponds to one PCINT on the ATmega (PCINT0, ..., PCINT3).
-
-To enable only a specific bank, simply add `USEMODULE += atmega_pcintN` to your
-Makefile. To enable all interrupts you can use `USEMODULE += atmega_pcint`.
-
-In case you want to add a new CPU, simply provide an `atmega_pcint.h` with your
-CPU and adapt your Makefile.dep and Makefile.features files.
- */
+ * @defgroup    boards_common_atmega ATmega common
+ * @ingroup     boards
+ * @brief       Shared files and configuration for ATmega-based boards
+ */

boards/common/atxmega/Kconfig

@@ -0,0 +1,12 @@
+# 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 MODULE_BOARDS_COMMON_ATXMEGA
+    bool
+    depends on TEST_KCONFIG
+    help
+        Common ATXmega boards code.

boards/derfmega128/Kconfig

@@ -18,3 +18,7 @@ config BOARD_DERFMEGA128
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/derfmega256/Kconfig

@@ -18,3 +18,8 @@ config BOARD_DERFMEGA256
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+    select MODULE_PERIPH_EEPROM if MODULE_EUI_PROVIDER && HAS_PERIPH_EEPROM
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/mega-xplained/Kconfig

@@ -18,3 +18,9 @@ config BOARD_MEGA_XPLAINED
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+    select HAVE_SAUL_ADC
+    select HAVE_SAUL_GPIO
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/microduino-corerf/Kconfig

@@ -19,3 +19,7 @@ config BOARD_MICRODUINO_CORERF
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

boards/waspmote-pro/Kconfig

@@ -17,3 +17,5 @@ config BOARD_WASPMOTE_PRO
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
     select HAS_ARDUINO
+
+source "$(RIOTKCONFIG)/Kconfig.ztimer_only"

boards/zigduino/Kconfig

@@ -19,3 +19,9 @@ config BOARD_ZIGDUINO
     select HAS_PERIPH_SPI
     select HAS_PERIPH_TIMER
     select HAS_PERIPH_UART
+
+    select MODULE_BOARDS_COMMON_ATMEGA if TEST_KCONFIG
+    select HAVE_SAUL_ADC
+    select HAVE_SAUL_GPIO
+
+source "$(RIOTBOARD)/common/atmega/Kconfig"

cpu/atmega_common/Kconfig

@@ -37,29 +37,17 @@ config CPU_FAM_ATMEGA128
 config CPU_FAM
     default "atmega128" if CPU_FAM_ATMEGA128
 
-## Declaration of specific features
-config HAS_ATMEGA_PCINT0
-    bool
-    help
-        Indicates that the Pin Change Interrupt bank 0 is present.
-
-config HAS_ATMEGA_PCINT1
-    bool
-    help
-        Indicates that the Pin Change Interrupt bank 1 is present.
-
-config HAS_ATMEGA_PCINT2
-    bool
-    help
-        Indicates that the Pin Change Interrupt bank 2 is present.
-
-config HAS_ATMEGA_PCINT3
-    bool
-    help
-        Indicates that the Pin Change Interrupt bank 3 is present.
-
 config ERROR_MODULES_CONFLICT
     default "On ATmega, the RTC and RTT use to the same hardware timer." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
     depends on CPU_COMMON_ATMEGA
 
+config MODULE_ATMEGA_COMMON
+    bool
+    depends on CPU_COMMON_ATMEGA
+    depends on TEST_KCONFIG
+    default y
+    help
+        ATmega common code.
+
+rsource "periph/Kconfig"
 source "$(RIOTCPU)/avr8_common/Kconfig"

cpu/atmega_common/doc.txt

@@ -2,4 +2,16 @@
  * @defgroup    cpu_atmega_common Atmel ATmega CPU: common files
  * @brief       AVR Atmega specific code
  * @ingroup     cpu
+ *
+ * ### Pin Change Interrupts
+ *
+ * Pin Change Interrupts (PCINTs) can be enabled using pseudo modules. To provide
+ * a low-memory overhead implementation, the PCINTs are grouped into **banks**.
+ * Each banks corresponds to one PCINT on the ATmega (PCINT0, ..., PCINT3).
+ *
+ * To enable only a specific bank, simply add `USEMODULE += atmega_pcintN` to your
+ * Makefile. To enable all interrupts you can use `USEMODULE += atmega_pcint`.
+ *
+ * In case you want to add a new CPU, simply provide an `atmega_pcint.h` with your
+ * CPU and adapt your Makefile.dep and Makefile.features files.
  */

cpu/atmega_common/periph/Kconfig

@@ -0,0 +1,71 @@
+# 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.
+#
+
+if TEST_KCONFIG && CPU_COMMON_ATMEGA
+
+config MODULE_ATMEGA_COMMON_PERIPH
+    bool
+    default y
+    help
+        Common ATmega peripheral drivers.
+
+config MODULE_ATMEGA_PCINT
+    bool
+    depends on HAS_ATMEGA_PCINT0 || HAS_ATMEGA_PCINT1 || HAS_ATMEGA_PCINT2 || HAS_ATMEGA_PCINT3
+    help
+      Say y to enable all the present Pin Change Interrupt banks.
+
+config MODULE_ATMEGA_PCINT0
+    bool
+    depends on HAS_ATMEGA_PCINT0
+    default MODULE_ATMEGA_PCINT
+    help
+        Say y to enable PIC bank 0.
+
+config MODULE_ATMEGA_PCINT1
+    bool
+    depends on HAS_ATMEGA_PCINT1
+    default MODULE_ATMEGA_PCINT
+    help
+        Say y to enable PIC bank 1.
+
+config MODULE_ATMEGA_PCINT2
+    bool
+    depends on HAS_ATMEGA_PCINT2
+    default MODULE_ATMEGA_PCINT
+    help
+        Say y to enable PIC bank 2.
+
+config MODULE_ATMEGA_PCINT3
+    bool
+    depends on HAS_ATMEGA_PCINT3
+    default MODULE_ATMEGA_PCINT
+    help
+        Say y to enable PIC bank 3.
+
+endif # TEST_KCONFIG && CPU_COMMON_ATMEGA
+
+## Declaration of specific features
+config HAS_ATMEGA_PCINT0
+    bool
+    help
+        Indicates that the Pin Change Interrupt bank 0 is present.
+
+config HAS_ATMEGA_PCINT1
+    bool
+    help
+        Indicates that the Pin Change Interrupt bank 1 is present.
+
+config HAS_ATMEGA_PCINT2
+    bool
+    help
+        Indicates that the Pin Change Interrupt bank 2 is present.
+
+config HAS_ATMEGA_PCINT3
+    bool
+    help
+        Indicates that the Pin Change Interrupt bank 3 is present.

cpu/atxmega/Kconfig

@@ -77,14 +77,11 @@ source "$(RIOTCPU)/atxmega/Kconfig.XMEGAE"
 config HAS_CPU_ATXMEGA
     bool
 
-config HAS_ATXMEGA_EBI
-    bool
-    help
-        Indicates that the External Bus Interface is present.
-
 config HAS_PERIPH_NVM
     bool
     help
         Indicates that the Non Volatile Memory controller is present.
 
+rsource "ebi/Kconfig"
+rsource "periph/Kconfig"
 source "$(RIOTCPU)/avr8_common/Kconfig"