Remove Kconfig dependency modelling

Kconfig

@@ -9,12 +9,6 @@ mainmenu "RIOT Configuration"
 # Load macro definitions
 rsource "kconfigs/Kconfig.consts"
 
-# Load feature declarations
-rsource "kconfigs/Kconfig.features"
-
-# Load error symbols
-rsource "kconfigs/Kconfig.errors"
-
 # For now, get used modules as macros from this file (see kconfig.mk)
 osource "$(KCONFIG_GENERATED_DEPENDENCIES)"
 
@@ -41,23 +35,5 @@ menu "External Packages"
 osource "$(KCONFIG_EXTERNAL_PKG_CONFIGS)"
 endmenu # External Packages
 
-comment "RIOT is in a migration phase."
 comment "Some configuration options may not be here. Use CFLAGS instead."
-
-comment "!! ERROR: There are conflicting modules active !!"
-    depends on ERROR_MODULES_CONFLICT != ""
-
-config TEST_KCONFIG
-    bool
-    default y if '$(TEST_KCONFIG)' = '1'
-    help
-        This is used during the Kconfig migration to test the module dependency
-        modelling. Don't change the default value unless you know what you are
-        doing.
-
-config DEVELHELP
-    bool "Development Help"
-    help
-        Set to enable code in RIOT that does safety checking which might not be
-        needed in a production environment but helps in the development
-        process.
+comment "Ideally, make a PR to add them to the Kconfig."

Makefile.base

@@ -74,11 +74,7 @@ endif
 
 ifneq (,$(SRCXX))
   ifeq (,$(filter cpp,$(USEMODULE)))
-    ifneq (1,$(TEST_KCONFIG))
-      $(error Found C++ source, but feature "cpp" is not used. Add "FEATURES_REQUIRED += cpp")
-    else
-      $(error Found C++ source, but "cpp" module is not used. Enable the MODULE_CPP in Kconfig)
-    endif
+    $(error Found C++ source, but feature "cpp" is not used. Add "FEATURES_REQUIRED += cpp")
   endif
 endif
 

Makefile.include

@@ -268,11 +268,6 @@ include $(RIOTMAKE)/scan-build.inc.mk
 
 export RIOTBUILD_CONFIG_HEADER_C = $(BINDIR)/riotbuild/riotbuild.h
 
-# When testing Kconfig's module modelling we need to run Kconfig
-ifeq (1,$(TEST_KCONFIG))
-  SHOULD_RUN_KCONFIG = 1
-endif
-
 ifeq ($(OS),Darwin)
   OPEN   := open
 else
@@ -425,40 +420,22 @@ include $(RIOTMAKE)/defaultmodules_regular.inc.mk
 # Include Kconfig functionalities
 include $(RIOTMAKE)/kconfig.mk
 
-# For testing, use TEST_KCONFIG as a switch between Makefile.dep and Kconfig
-ifeq (1,$(TEST_KCONFIG))
-  ifneq ($(RIOT_CI_BUILD),1)
-    $(info === [ATTENTION] Testing Kconfig dependency modelling ===)
-  endif
-  KCONFIG_MODULES := $(call lowercase,$(patsubst CONFIG_MODULE_%,%,$(filter CONFIG_MODULE_%,$(.VARIABLES))))
-  USEMODULE := $(KCONFIG_MODULES)
-  KCONFIG_PACKAGES := $(call lowercase,$(patsubst CONFIG_PACKAGE_%,%,$(filter CONFIG_PACKAGE_%,$(.VARIABLES))))
-  USEPKG := $(KCONFIG_PACKAGES)
+# always select provided architecture features
+FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED))
+# always select CPU core features
+FEATURES_REQUIRED += $(filter cpu_core_%,$(FEATURES_PROVIDED))
 
-  # Locate used packages in $(RIOTPKG) or $(EXTERNAL_PKG_DIRS).
-  PKGDIRS := $(RIOTPKG) $(EXTERNAL_PKG_DIRS)
-  PKG_PATHS := $(sort $(foreach dir,$(PKGDIRS),\
-    $(foreach pkg,$(USEPKG),$(dir $(wildcard $(dir)/$(pkg)/Makefile)))))
+# check if required features are provided and update $(FEATURES_USED)
+include $(RIOTMAKE)/features_check.inc.mk
 
-  EXTERNAL_MODULE_PATHS := $(dir $(EXTERNAL_MODULE_KCONFIGS))
-else
-  # always select provided architecture features
-  FEATURES_REQUIRED += $(filter arch_%,$(FEATURES_PROVIDED))
-  # always select CPU core features
-  FEATURES_REQUIRED += $(filter cpu_core_%,$(FEATURES_PROVIDED))
+# handle removal of default modules
+USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
 
-  # check if required features are provided and update $(FEATURES_USED)
-  include $(RIOTMAKE)/features_check.inc.mk
+# avoid recursive expansion
+USEMODULE := $(sort $(USEMODULE))
 
-  # handle removal of default modules
-  USEMODULE += $(filter-out $(DISABLE_MODULE), $(DEFAULT_MODULE))
-
-  # avoid recursive expansion
-  USEMODULE := $(sort $(USEMODULE))
-
-  # process dependencies
-  include $(RIOTMAKE)/dependency_resolution.inc.mk
-endif
+# process dependencies
+include $(RIOTMAKE)/dependency_resolution.inc.mk
 
 # Include dfu-util configuration when using riotboot_dfu bootloader before
 # including the board's Makefile.include which could define dfu-util

boards/Kconfig

@@ -8,17 +8,3 @@ config BOARD
     string
     help
         Name of the currently selected board.
-
-config MODULE_BOARD
-    bool
-    default y
-    depends on TEST_KCONFIG
-    help
-        Module which holds all board-specific files.
-
-config MODULE_BOARD_COMMON_INIT
-    bool
-    default y
-    depends on TEST_KCONFIG
-    help
-        Common board initialization module

boards/acd52832/Kconfig

@@ -12,10 +12,5 @@ config BOARD_ACD52832
     default y
     select BOARD_COMMON_NRF52
     select CPU_MODEL_NRF52832XXAA
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_UART
-
-    select HAVE_SAUL_GPIO
 
 source "$(RIOTBOARD)/common/nrf52xxxdk/Kconfig"

boards/adafruit-clue/Kconfig

@@ -12,22 +12,5 @@ config BOARD_ADAFRUIT_CLUE
     default y
     select BOARD_COMMON_NRF52
     select CPU_MODEL_NRF52840XXAA
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-    select HAS_HIGHLEVEL_STDIO
-
-    select HAVE_APDS9960
-    select HAVE_BMP280_I2C
-    select HAVE_ILI9341
-    select HAVE_LIS3MDL
-    select HAVE_SAUL_GPIO
-    select HAVE_SHT3X
-
-    select MODULE_USB_BOARD_RESET if KCONFIG_USB && TEST_KCONFIG
-
-config FORCE_USB_STDIO
-    default y
 
 source "$(RIOTBOARD)/common/nrf52/Kconfig"

boards/adafruit-grand-central-m4-express/Kconfig

@@ -11,26 +11,3 @@ config BOARD_ADAFRUIT_GRAND_CENTRAL_M4_EXPRESS
     bool
     default y
     select CPU_MODEL_SAMD51P20A
-    select HAS_ARDUINO_ANALOG
-    select HAS_ARDUINO_PINS
-    select HAS_HIGHLEVEL_STDIO
-    select HAS_PERIPH_ADC
-    select HAS_PERIPH_DAC
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_PWM
-    select HAS_PERIPH_RTC
-    select HAS_PERIPH_RTT
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_TIMER
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-    select HAVE_SAUL_GPIO
-
-    select HAVE_MTD_SPI_NOR
-    # This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
-    select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
-
-    select HAVE_MTD_SDCARD_DEFAULT
-    select MODULE_FATFS_VFS if MODULE_VFS_DEFAULT
-
-source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/adafruit-itsybitsy-m4/Kconfig

@@ -11,21 +11,3 @@ config BOARD_ADAFRUIT_ITSYBITSY_M4
     bool
     default y
     select CPU_MODEL_SAMD51G19A
-    select HAS_HIGHLEVEL_STDIO
-    select HAS_PERIPH_DAC
-    select HAS_PERIPH_ADC
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_RTC
-    select HAS_PERIPH_RTT
-    select HAS_PERIPH_PWM
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_TIMER
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-    select HAVE_SAUL_GPIO
-
-    select HAVE_MTD_SPI_NOR
-    # This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
-    select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
-
-source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/adafruit-itsybitsy-nrf52/Kconfig

@@ -12,17 +12,5 @@ config BOARD_ADAFRUIT_ITSYBITSY_NRF52
     default y
     select BOARD_COMMON_NRF52
     select CPU_MODEL_NRF52840XXAA
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-    select HAS_HIGHLEVEL_STDIO
-
-    select HAVE_SAUL_GPIO
-
-    select MODULE_USB_BOARD_RESET if KCONFIG_USB && TEST_KCONFIG
-
-config FORCE_USB_STDIO
-    default y
 
 source "$(RIOTBOARD)/common/nrf52/Kconfig"

boards/adafruit-pybadge/Kconfig

@@ -11,22 +11,3 @@ config BOARD_ADAFRUIT_PYBADGE
     bool
     default y
     select CPU_MODEL_SAMD51J19A
-    select HAS_HIGHLEVEL_STDIO
-    select HAS_PERIPH_ADC
-    select HAS_PERIPH_DAC
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_PWM
-    select HAS_PERIPH_RTC
-    select HAS_PERIPH_RTT
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_TIMER
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-
-    select HAVE_ST7735
-    select HAVE_SAUL_GPIO
-    select HAVE_MTD_SPI_NOR
-    # This specific board requires SPI_ON_QSPI for the MTD_SPI_NOR
-    select MODULE_PERIPH_SPI_ON_QSPI if MODULE_MTD_SPI_NOR
-
-source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/airfy-beacon/Kconfig

@@ -12,10 +12,5 @@ config BOARD_AIRFY_BEACON
     default y
     select BOARD_COMMON_NRF51
     select CPU_MODEL_NRF51X22XXAA
-    select HAS_PERIPH_ADC
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_UART
-    select MODULE_BOARDS_COMMON_NRF51 if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/nrf51/Kconfig"

boards/alientek-pandora/Kconfig

@@ -13,18 +13,7 @@ config BOARD_ALIENTEK_PANDORA
     default y
     select CPU_MODEL_STM32L475VE
 
-    # Put defined MCU peripherals here (in alphabetical order)
-    select HAS_PERIPH_RTC
-    select HAS_PERIPH_RTT
-    select HAS_PERIPH_TIMER
-    select HAS_PERIPH_UART
-
-    # Put other features for this board (in alphabetical order)
-    select HAS_RIOTBOOT
-
     # Clock configuration
     select BOARD_HAS_LSE
 
-    select HAVE_SAUL_GPIO
-
 source "$(RIOTBOARD)/common/stm32/Kconfig"

boards/arduino-duemilanove/Kconfig

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

boards/arduino-leonardo/Kconfig

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

boards/arduino-mega2560/Kconfig

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

boards/arduino-mkr1000/Kconfig

@@ -11,6 +11,5 @@ config BOARD_ARDUINO_MKR1000
     bool
     default y
     select BOARD_COMMON_ARDUINO_MKR
-    select MODULE_BOARDS_COMMON_ARDUINO-MKR if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/arduino-mkr/Kconfig"

boards/arduino-mkrfox1200/Kconfig

@@ -11,6 +11,5 @@ config BOARD_ARDUINO_MKRFOX1200
     bool
     default y
     select BOARD_COMMON_ARDUINO_MKR
-    select MODULE_BOARDS_COMMON_ARDUINO-MKR if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/arduino-mkr/Kconfig"

boards/arduino-mkrwan1300/Kconfig

@@ -11,6 +11,5 @@ config BOARD_ARDUINO_MKRWAN1300
     bool
     default y
     select BOARD_COMMON_ARDUINO_MKR
-    select MODULE_BOARDS_COMMON_ARDUINO-MKR if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/arduino-mkr/Kconfig"

boards/arduino-mkrzero/Kconfig

@@ -11,6 +11,5 @@ config BOARD_ARDUINO_MKRZERO
     bool
     default y
     select BOARD_COMMON_ARDUINO_MKR
-    select MODULE_BOARDS_COMMON_ARDUINO-MKR if TEST_KCONFIG
 
 source "$(RIOTBOARD)/common/arduino-mkr/Kconfig"

boards/arduino-nano-33-ble/Kconfig

@@ -12,17 +12,5 @@ config BOARD_ARDUINO_NANO_33_BLE
     default y
     select BOARD_COMMON_NRF52
     select CPU_MODEL_NRF52840XXAA
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-    select HAS_HIGHLEVEL_STDIO
-
-    select HAVE_SAUL_GPIO
-
-    select MODULE_USB_BOARD_RESET if KCONFIG_USB && TEST_KCONFIG
-
-config FORCE_USB_STDIO
-    default y
 
 source "$(RIOTBOARD)/common/nrf52/Kconfig"

boards/arduino-nano-33-iot/Kconfig

@@ -11,17 +11,3 @@ config BOARD_ARDUINO_NANO_33_IOT
     bool
     default y
     select CPU_MODEL_SAMD21G18A
-    select HAS_PERIPH_ADC
-    select HAS_PERIPH_I2C
-    select HAS_PERIPH_PWM
-    select HAS_PERIPH_RTC
-    select HAS_PERIPH_RTT
-    select HAS_PERIPH_SPI
-    select HAS_PERIPH_TIMER
-    select HAS_PERIPH_UART
-    select HAS_PERIPH_USBDEV
-    select HAS_HIGHLEVEL_STDIO
-
-    select HAVE_SAUL_GPIO
-
-source "$(RIOTBOARD)/common/samdx1-arduino-bootloader/Kconfig"

boards/arduino-nano/Kconfig

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

boards/arduino-uno/Kconfig

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