diff --git a/boards/thingy52/Makefile.features b/boards/thingy52/Makefile.features index 0ec83cf861..3ac7472acb 100644 --- a/boards/thingy52/Makefile.features +++ b/boards/thingy52/Makefile.features @@ -5,10 +5,4 @@ FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += vdd_lc_filter_reg1 -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_BOARD_CONFIG += $(BOARDDIR)/thingy52.config -endif - include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/cpu/cc2538/Makefile.features b/cpu/cc2538/Makefile.features index e19f99cf64..976e8c4e8a 100644 --- a/cpu/cc2538/Makefile.features +++ b/cpu/cc2538/Makefile.features @@ -16,9 +16,3 @@ FEATURES_PROVIDED += periph_wdt FEATURES_PROVIDED += cortexm_mpu include $(RIOTCPU)/cortexm_common/Makefile.features - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/cc2538/cc2538.config -endif diff --git a/cpu/efm32/Makefile.features b/cpu/efm32/Makefile.features index 536dd070c9..316d46457f 100644 --- a/cpu/efm32/Makefile.features +++ b/cpu/efm32/Makefile.features @@ -49,10 +49,3 @@ ifeq (1,$(EFM32_LEUART_ENABLED)) endif include $(RIOTCPU)/cortexm_common/Makefile.features - -# Add efm32 configurations after including cortexm_common so efm32 takes precendence -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1,$(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/efm32/efm32.config -endif diff --git a/cpu/esp32/Makefile.features b/cpu/esp32/Makefile.features index dfd91e25b0..68ee7f15d0 100644 --- a/cpu/esp32/Makefile.features +++ b/cpu/esp32/Makefile.features @@ -66,9 +66,3 @@ ifneq (,$(filter esp32-wrover% esp32s2%r2 esp32s3%r2 esp32s3%r8 esp32s3%r8v,$(CP FEATURES_PROVIDED += esp_spi_oct endif endif - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_ADD_CONFIG += $(RIOTCPU)/esp32/esp32.config -endif diff --git a/cpu/esp8266/Makefile.features b/cpu/esp8266/Makefile.features index 75114727e7..1007d04d0f 100644 --- a/cpu/esp8266/Makefile.features +++ b/cpu/esp8266/Makefile.features @@ -7,9 +7,3 @@ CPU_CORE = xtensa-l106 include $(RIOTCPU)/esp_common/Makefile.features FEATURES_PROVIDED += arch_esp8266 - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_ADD_CONFIG += $(RIOTCPU)/esp8266/esp8266.config -endif diff --git a/cpu/esp_common/Makefile.features b/cpu/esp_common/Makefile.features index d36e47dcee..c15babdec8 100644 --- a/cpu/esp_common/Makefile.features +++ b/cpu/esp_common/Makefile.features @@ -32,9 +32,3 @@ endif FEATURES_CONFLICT += esp_wifi_ap:esp_now FEATURES_CONFLICT_MSG += "ESP_NOW and ESP_WIFI_AP can not be used at the same time." - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_ADD_CONFIG += $(RIOTCPU)/esp_common/esp_common.config -endif diff --git a/cpu/gd32v/Makefile.features b/cpu/gd32v/Makefile.features index 0d630145b3..cf67a7b3b8 100644 --- a/cpu/gd32v/Makefile.features +++ b/cpu/gd32v/Makefile.features @@ -24,9 +24,3 @@ FEATURES_PROVIDED += periph_flashpage_in_address_space FEATURES_PROVIDED += periph_flashpage_pagewise include $(RIOTCPU)/riscv_common/Makefile.features - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_ADD_CONFIG += $(RIOTCPU)/gd32v/gd32v.config -endif diff --git a/cpu/kinetis/Makefile.features b/cpu/kinetis/Makefile.features index a3cb342f89..e31a383679 100644 --- a/cpu/kinetis/Makefile.features +++ b/cpu/kinetis/Makefile.features @@ -35,9 +35,3 @@ else endif include $(RIOTCPU)/cortexm_common/Makefile.features - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/kinetis/kinetis.config -endif diff --git a/cpu/lpc1768/Makefile.features b/cpu/lpc1768/Makefile.features index 64de7f5367..6f3c2419e5 100644 --- a/cpu/lpc1768/Makefile.features +++ b/cpu/lpc1768/Makefile.features @@ -8,9 +8,3 @@ FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_pm include $(RIOTCPU)/cortexm_common/Makefile.features - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/lpc1768/lpc1768.config -endif diff --git a/cpu/lpc23xx/Makefile.features b/cpu/lpc23xx/Makefile.features index 4c60626e51..850654fb2d 100644 --- a/cpu/lpc23xx/Makefile.features +++ b/cpu/lpc23xx/Makefile.features @@ -7,9 +7,3 @@ FEATURES_PROVIDED += periph_timer_periodic FEATURES_PROVIDED += periph_rtc_ms include $(RIOTCPU)/arm7_common/Makefile.features - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/lpc23xx/lpc23xx.config -endif diff --git a/cpu/native/Makefile.features b/cpu/native/Makefile.features index 8b0b4722a6..25a8cc10fd 100644 --- a/cpu/native/Makefile.features +++ b/cpu/native/Makefile.features @@ -31,9 +31,3 @@ ifeq ($(OS),Linux) # CAN is only supported on Linux through socketCAN FEATURES_PROVIDED += periph_can endif - -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/native/native.config -endif diff --git a/cpu/sam0_common/Makefile.features b/cpu/sam0_common/Makefile.features index 184942584b..04ce16facb 100644 --- a/cpu/sam0_common/Makefile.features +++ b/cpu/sam0_common/Makefile.features @@ -48,10 +48,3 @@ FEATURES_CONFLICT += periph_gpio_irq:periph_gpio_ll_irq FEATURES_CONFLICT_MSG += "GPIO IRQs can only be managed with one API." include $(RIOTCPU)/cortexm_common/Makefile.features - -# Add sam0 configurations after including cortexm_common so sam0 takes precendence -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/sam0_common/sam0_common.config -endif diff --git a/cpu/stm32/Makefile.features b/cpu/stm32/Makefile.features index 4757210cf3..8d9fb8d780 100644 --- a/cpu/stm32/Makefile.features +++ b/cpu/stm32/Makefile.features @@ -110,10 +110,3 @@ ifneq (,$(filter $(CPU_MODEL),$(STM32_WITH_MPU))) endif include $(RIOTCPU)/cortexm_common/Makefile.features - -# Add stm32 configs after including cortexm_common so stm32 takes precedence -# This configuration enables modules that are only available when using Kconfig -# module modelling -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_CPU_CONFIG += $(RIOTCPU)/stm32/stm32.config -endif diff --git a/tests/build_system/external_board_dirs/esp-ci-boards/esp8266-ci/Makefile.features b/tests/build_system/external_board_dirs/esp-ci-boards/esp8266-ci/Makefile.features index 2ad25ff5c4..5ebe212f55 100644 --- a/tests/build_system/external_board_dirs/esp-ci-boards/esp8266-ci/Makefile.features +++ b/tests/build_system/external_board_dirs/esp-ci-boards/esp8266-ci/Makefile.features @@ -1,5 +1 @@ include $(RIOTBOARD)/esp8266-olimex-mod/Makefile.features - -ifeq (1, $(TEST_KCONFIG)) - KCONFIG_ADD_CONFIG += $(BOARDDIR)/$(BOARD).config -endif