cleanup kconfig esp stuff

RIOT-OS · Jan 10, 2022 · 0fb2b96 · 0fb2b96
1 parent 02681f3
commit 0fb2b96
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 19 deletions.
diff --git a/boards/esp32-wrover-kit/Kconfig b/boards/esp32-wrover-kit/Kconfig
@@ -24,5 +24,10 @@ config BOARD_ESP32_WROVER_KIT
     select HAVE_ILI9341
     select HAVE_RIOT_CI_BUILD_ESP_HW_COUNTER
     select HAVE_RIOT_CI_BUILD_ESP_I2C_HW
+    select MODULE_ESP_IDF_HEAP if TEST_KCONFIG && RIOT_CI_BUILD
+    select MODULE_ESP_LOG_STARTUP if TEST_KCONFIG && RIOT_CI_BUILD
+    select MODULE_ESP_LOG_TAGGED if TEST_KCONFIG && RIOT_CI_BUILD
+    select MODULE_ESP_QEMU if TEST_KCONFIG && RIOT_CI_BUILD
+    select MODULE_ESP_SPI_RAM if TEST_KCONFIG && RIOT_CI_BUILD
 
 source "$(RIOTBOARD)/common/esp32/Kconfig"
diff --git a/boards/esp32-wrover-kit/Makefile.features b/boards/esp32-wrover-kit/Makefile.features
@@ -20,7 +20,4 @@ FEATURES_PROVIDED += arduino
 # module modelling
 ifeq (1, $(TEST_KCONFIG))
   KCONFIG_BOARD_CONFIG += $(BOARDDIR)/esp32-wrover-kit.config
-  ifeq (1, $(RIOT_CI_BUILD))
-    KCONFIG_BOARD_CONFIG += $(BOARDDIR)/riot-ci-build.config
-  endif
 endif
diff --git a/boards/esp32-wrover-kit/riot-ci-build.config b/boards/esp32-wrover-kit/riot-ci-build.config
diff --git a/boards/esp8266-olimex-mod/Kconfig b/boards/esp8266-olimex-mod/Kconfig
@@ -15,4 +15,8 @@ config BOARD_ESP8266_OLIMEX_MOD
 
     select HAVE_RIOT_CI_BUILD_ESP_SW_TIMER
 
+    select MODULE_ESP_LOG_STARTUP if TEST_KCONFIG && RIOT_CI_BUILD
+    select MODULE_ESP_LOG_TAGGED if TEST_KCONFIG && RIOT_CI_BUILD
+    select MODULE_ESP_QEMU if TEST_KCONFIG && RIOT_CI_BUILD
+
 source "$(RIOTBOARD)/common/esp8266/Kconfig"
diff --git a/boards/esp8266-olimex-mod/Makefile.features b/boards/esp8266-olimex-mod/Makefile.features
@@ -2,10 +2,4 @@ CPU_MODEL = esp8266-esp-12x
 
 # Board provides all common peripheral features defined for all ESP8266 boards
 
-ifeq (1, $(TEST_KCONFIG))
-  ifeq (1, $(RIOT_CI_BUILD))
-    KCONFIG_BOARD_CONFIG += $(BOARDDIR)/riot-ci-build.config
-  endif
-endif
-
 include $(RIOTBOARD)/common/esp8266/Makefile.features
diff --git a/boards/esp8266-olimex-mod/riot-ci-build.config b/boards/esp8266-olimex-mod/riot-ci-build.config