From 348b4408101ae8e23ddae78db7a6acb2f95c07fb Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Fri, 7 Jan 2022 11:10:13 +0100 Subject: [PATCH] cpu/esp*: Model RIOT_CI_BUILD deps in kconfig --- boards/esp32-wrover-kit/Kconfig | 2 ++ boards/esp8266-olimex-mod/Kconfig | 2 ++ cpu/esp32/periph/Kconfig | 12 ++++++++++++ cpu/esp32/periph/Kconfig.i2c | 6 ++++++ cpu/esp8266/Kconfig | 12 ++++++++++++ 5 files changed, 34 insertions(+) diff --git a/boards/esp32-wrover-kit/Kconfig b/boards/esp32-wrover-kit/Kconfig index 2fbb3a316316..607fc7dcd9f5 100644 --- a/boards/esp32-wrover-kit/Kconfig +++ b/boards/esp32-wrover-kit/Kconfig @@ -22,5 +22,7 @@ config BOARD_ESP32_WROVER_KIT select HAS_SDCARD_SPI select HAVE_ILI9341 + select HAVE_RIOT_CI_BUILD_ESP_HW_COUNTER + select HAVE_RIOT_CI_BUILD_ESP_I2C_HW source "$(RIOTBOARD)/common/esp32/Kconfig" diff --git a/boards/esp8266-olimex-mod/Kconfig b/boards/esp8266-olimex-mod/Kconfig index 429d541126e7..22da220523fa 100644 --- a/boards/esp8266-olimex-mod/Kconfig +++ b/boards/esp8266-olimex-mod/Kconfig @@ -13,4 +13,6 @@ config BOARD_ESP8266_OLIMEX_MOD select BOARD_COMMON_ESP8266 select CPU_MODEL_ESP8266_ESP_12X + select HAVE_RIOT_CI_BUILD_ESP_SW_TIMER + source "$(RIOTBOARD)/common/esp8266/Kconfig" diff --git a/cpu/esp32/periph/Kconfig b/cpu/esp32/periph/Kconfig index d9beb65cac34..1ffcbe036cfd 100644 --- a/cpu/esp32/periph/Kconfig +++ b/cpu/esp32/periph/Kconfig @@ -27,4 +27,16 @@ config MODULE_PERIPH_RTT_HW_RTC bool default y if MODULE_PERIPH_RTT +config MODULE_ESP_HW_COUNTER + bool + prompt "Use hardware counters to run RIOT" if !(RIOT_CI_BUILD && HAVE_RIOT_CI_BUILD_ESP_HW_COUNTER) + default y if (RIOT_CI_BUILD && HAVE_RIOT_CI_BUILD_ESP_HW_COUNTER) + depends on MODULE_PERIPH_TIMER + + endif # TEST_KCONFIG + +config HAVE_RIOT_CI_BUILD_ESP_HW_COUNTER + bool + help + Indicates the CI build will try to enable this. diff --git a/cpu/esp32/periph/Kconfig.i2c b/cpu/esp32/periph/Kconfig.i2c index fbbce1598b04..4ff04f2fd795 100644 --- a/cpu/esp32/periph/Kconfig.i2c +++ b/cpu/esp32/periph/Kconfig.i2c @@ -9,6 +9,7 @@ if TEST_KCONFIG choice bool "I2C implementation" + default MODULE_ESP_I2C_HW if (RIOT_CI_BUILD && HAVE_RIOT_CI_BUILD_ESP_I2C_HW) depends on MODULE_PERIPH_I2C help Due to the poor and faulty hardware I2C implementation the software one @@ -33,3 +34,8 @@ config MODULE_PERIPH_I2C_HW Hardware implementation of I2C. endif # TEST_KCONFIG + +config HAVE_RIOT_CI_BUILD_ESP_I2C_HW + bool + help + Indicates the CI build will try to enable this. diff --git a/cpu/esp8266/Kconfig b/cpu/esp8266/Kconfig index 354468be414c..0f8e0e47f108 100644 --- a/cpu/esp8266/Kconfig +++ b/cpu/esp8266/Kconfig @@ -72,5 +72,17 @@ config MODULE_ESP_I2C_SW default y if MODULE_PERIPH_I2C select MODULE_PERIPH_I2C_SW +config MODULE_ESP_SW_TIMER + bool + prompt "Use software timers to run RIOT" if !(RIOT_CI_BUILD && HAVE_RIOT_CI_BUILD_ESP_SW_TIMER) + default y if (RIOT_CI_BUILD && HAVE_RIOT_CI_BUILD_ESP_SW_TIMER) + depends on MODULE_PERIPH_TIMER + depends on TEST_KCONFIG + +config HAVE_RIOT_CI_BUILD_ESP_SW_TIMER + bool + help + Indicates the CI build will try to enable this. + rsource "sdk/Kconfig" rsource "vendor/Kconfig"