diff --git a/boards/common/esp32/Kconfig b/boards/common/esp32/Kconfig index b09f3105cb..8f633cc4bc 100644 --- a/boards/common/esp32/Kconfig +++ b/boards/common/esp32/Kconfig @@ -6,10 +6,7 @@ config BOARD_COMMON_ESP32 bool - select HAS_PERIPH_GPIO - select HAS_PERIPH_GPIO_IRQ select HAS_PERIPH_UART - select HAS_PERIPH_UART_MODECFG select HAVE_SAUL_GPIO diff --git a/boards/common/esp32/Makefile.features b/boards/common/esp32/Makefile.features index e3babfae79..3d3348ae93 100644 --- a/boards/common/esp32/Makefile.features +++ b/boards/common/esp32/Makefile.features @@ -1,7 +1,4 @@ CPU = esp32 -# additional features provided by all boards are GPIOs and at least one UART -FEATURES_PROVIDED += periph_gpio -FEATURES_PROVIDED += periph_gpio_irq +# additional features provided by all boards is at least one UART FEATURES_PROVIDED += periph_uart -FEATURES_PROVIDED += periph_uart_modecfg diff --git a/boards/common/esp8266/Kconfig b/boards/common/esp8266/Kconfig index fe0abba89d..996efda23b 100644 --- a/boards/common/esp8266/Kconfig +++ b/boards/common/esp8266/Kconfig @@ -8,13 +8,10 @@ config BOARD_COMMON_ESP8266 bool select HAS_ARDUINO select HAS_PERIPH_ADC - select HAS_PERIPH_GPIO - select HAS_PERIPH_GPIO_IRQ select HAS_PERIPH_I2C select HAS_PERIPH_PWM select HAS_PERIPH_SPI select HAS_PERIPH_UART - select HAS_PERIPH_UART_MODECFG select HAVE_SAUL_GPIO diff --git a/boards/common/esp8266/Makefile.features b/boards/common/esp8266/Makefile.features index 00c9d1a179..3f0ede6249 100644 --- a/boards/common/esp8266/Makefile.features +++ b/boards/common/esp8266/Makefile.features @@ -3,12 +3,9 @@ CPU = esp8266 # MCU defined peripheral features provided by all boards in alphabetical order FEATURES_PROVIDED += periph_adc -FEATURES_PROVIDED += periph_gpio -FEATURES_PROVIDED += periph_gpio_irq FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_uart -FEATURES_PROVIDED += periph_uart_modecfg FEATURES_PROVIDED += arduino diff --git a/boards/esp32-olimex-evb/Makefile.features b/boards/esp32-olimex-evb/Makefile.features index 3c839bd3c0..6dd12bc891 100644 --- a/boards/esp32-olimex-evb/Makefile.features +++ b/boards/esp32-olimex-evb/Makefile.features @@ -5,7 +5,7 @@ include $(RIOTBOARD)/common/esp32/Makefile.features # additional features provided by the board (no ADC and no DAC) ifneq (,$(filter olimex_esp32_gateway,$(USEMODULE))) - FEATURES_PROVIDED += periph_adc + FEATURES_PROVIDED += periph_adc endif FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm diff --git a/cpu/esp32/Kconfig b/cpu/esp32/Kconfig index abad7755da..cb03764a9b 100644 --- a/cpu/esp32/Kconfig +++ b/cpu/esp32/Kconfig @@ -16,10 +16,6 @@ config CPU_FAM_ESP32 select HAS_CPU_ESP32 select HAS_ESP_WIFI_ENTERPRISE select HAS_PERIPH_ADC_CTRL - select HAS_PERIPH_RTC - select HAS_PERIPH_RTT - select HAS_PERIPH_RTT_SET_COUNTER - select HAS_PERIPH_RTT_OVERFLOW select MODULE_PERIPH_RTT if HAS_PERIPH_RTT && MODULE_PM_LAYERED select MODULE_RTT_RTC if HAS_PERIPH_RTT && MODULE_PERIPH_RTC diff --git a/cpu/esp32/Makefile.features b/cpu/esp32/Makefile.features index 089df2d550..fb29a22738 100644 --- a/cpu/esp32/Makefile.features +++ b/cpu/esp32/Makefile.features @@ -7,10 +7,6 @@ include $(RIOTCPU)/esp_common/Makefile.features FEATURES_PROVIDED += arch_esp32 FEATURES_PROVIDED += esp_wifi_enterprise FEATURES_PROVIDED += periph_adc_ctrl -FEATURES_PROVIDED += periph_rtc -FEATURES_PROVIDED += periph_rtt -FEATURES_PROVIDED += periph_rtt_set_counter -FEATURES_PROVIDED += periph_rtt_overflow ifneq (,$(filter esp32-wrover%,$(CPU_MODEL))) FEATURES_PROVIDED += esp_spi_ram diff --git a/cpu/esp8266/Kconfig b/cpu/esp8266/Kconfig index 354468be41..ff332b8a4f 100644 --- a/cpu/esp8266/Kconfig +++ b/cpu/esp8266/Kconfig @@ -14,10 +14,6 @@ config CPU_FAM_ESP8266 select CPU_CORE_XTENSA_L106 select HAS_ARCH_ESP8266 select HAS_CPU_ESP8266 - select HAS_PERIPH_RTC - select HAS_PERIPH_RTT - select HAS_PERIPH_RTT_OVERFLOW - select HAS_PERIPH_RTT_SET_COUNTER select PACKAGE_ESP8266_SDK if TEST_KCONFIG select MODULE_ESP_SDK if TEST_KCONFIG diff --git a/cpu/esp8266/Makefile.features b/cpu/esp8266/Makefile.features index be0c10b63d..bf170a7a38 100644 --- a/cpu/esp8266/Makefile.features +++ b/cpu/esp8266/Makefile.features @@ -5,10 +5,6 @@ CPU_FAM = esp8266 include $(RIOTCPU)/esp_common/Makefile.features FEATURES_PROVIDED += arch_esp8266 -FEATURES_PROVIDED += periph_rtt -FEATURES_PROVIDED += periph_rtc -FEATURES_PROVIDED += periph_rtt_overflow -FEATURES_PROVIDED += periph_rtt_set_counter # This configuration enables modules that are only available when using Kconfig # module modelling diff --git a/cpu/esp_common/Kconfig b/cpu/esp_common/Kconfig index 2f0323968c..aef54697a0 100644 --- a/cpu/esp_common/Kconfig +++ b/cpu/esp_common/Kconfig @@ -16,12 +16,19 @@ config CPU_COMMON_ESP select HAS_ESP_SPIFFS select HAS_ESP_WIFI select HAS_ESP_WIFI_AP - select HAS_NEWLIB select HAS_LIBSTDCPP + select HAS_NEWLIB select HAS_PERIPH_CPUID + select HAS_PERIPH_GPIO + select HAS_PERIPH_GPIO_IRQ select HAS_PERIPH_HWRNG select HAS_PERIPH_PM + select HAS_PERIPH_RTC + select HAS_PERIPH_RTT + select HAS_PERIPH_RTT_OVERFLOW + select HAS_PERIPH_RTT_SET_COUNTER select HAS_PERIPH_TIMER + select HAS_PERIPH_UART_MODECFG select HAS_SSP ## Declaration of specific features diff --git a/cpu/esp_common/Makefile.features b/cpu/esp_common/Makefile.features index 9e1858dc87..6374352c21 100644 --- a/cpu/esp_common/Makefile.features +++ b/cpu/esp_common/Makefile.features @@ -7,14 +7,21 @@ FEATURES_PROVIDED += arch_esp FEATURES_PROVIDED += cpp FEATURES_PROVIDED += esp_now FEATURES_PROVIDED += esp_spiffs -FEATURES_PROVIDED += esp_wifi_ap FEATURES_PROVIDED += esp_wifi +FEATURES_PROVIDED += esp_wifi_ap FEATURES_PROVIDED += libstdcpp FEATURES_PROVIDED += newlib FEATURES_PROVIDED += periph_cpuid +FEATURES_PROVIDED += periph_gpio +FEATURES_PROVIDED += periph_gpio_irq FEATURES_PROVIDED += periph_hwrng FEATURES_PROVIDED += periph_pm +FEATURES_PROVIDED += periph_rtc +FEATURES_PROVIDED += periph_rtt +FEATURES_PROVIDED += periph_rtt_overflow +FEATURES_PROVIDED += periph_rtt_set_counter FEATURES_PROVIDED += periph_timer +FEATURES_PROVIDED += periph_uart_modecfg FEATURES_PROVIDED += ssp FEATURES_CONFLICT += esp_wifi_ap:esp_now