From 6ba5b21337bae6e45623ce1143d50c56a3f277e3 Mon Sep 17 00:00:00 2001 From: Felipe Neves Date: Thu, 4 Aug 2022 22:43:58 -0300 Subject: [PATCH] soc: xtensa: esp32_net: update kconfig specific of soc to make it compatible to the new toolchain. Signed-off-by: Felipe Neves --- boards/xtensa/esp32_net/esp32_net.yaml | 13 +++++-------- cmake/toolchain/espressif/target.cmake | 1 - modules/Kconfig.esp32 | 2 +- soc/xtensa/esp32_net/Kconfig.defconfig | 4 ++++ soc/xtensa/esp32_net/Kconfig.soc | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/boards/xtensa/esp32_net/esp32_net.yaml b/boards/xtensa/esp32_net/esp32_net.yaml index b815a433c98..de91be1b949 100644 --- a/boards/xtensa/esp32_net/esp32_net.yaml +++ b/boards/xtensa/esp32_net/esp32_net.yaml @@ -3,11 +3,8 @@ name: ESP32_NET type: mcu arch: xtensa toolchain: - - espressif -supported: - - gpio - - i2c - - watchdog - - uart - - pinmux - - nvs + - zephyr +testing: + ignore_tags: + - net + - bluetooth diff --git a/cmake/toolchain/espressif/target.cmake b/cmake/toolchain/espressif/target.cmake index f27987deb07..f11f48883ab 100644 --- a/cmake/toolchain/espressif/target.cmake +++ b/cmake/toolchain/espressif/target.cmake @@ -9,7 +9,6 @@ set(LINKER ld) set(BINTOOLS gnu) set(CROSS_COMPILE_TARGET_xtensa_esp32 xtensa-esp32-elf) -set(CROSS_COMPILE_TARGET_xtensa_esp32_net xtensa-esp32-elf) set(CROSS_COMPILE_TARGET_xtensa_esp32s2 xtensa-esp32s2-elf) set(CROSS_COMPILE_TARGET_riscv_esp32c3 riscv32-esp-elf) diff --git a/modules/Kconfig.esp32 b/modules/Kconfig.esp32 index 11541e83d6f..43095c24c96 100644 --- a/modules/Kconfig.esp32 +++ b/modules/Kconfig.esp32 @@ -3,4 +3,4 @@ config HAS_ESPRESSIF_HAL bool - depends on SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3 + depends on SOC_ESP32 || SOC_ESP32S2 || SOC_ESP32C3 || SOC_ESP32_NET diff --git a/soc/xtensa/esp32_net/Kconfig.defconfig b/soc/xtensa/esp32_net/Kconfig.defconfig index 62cb57742cf..31cd6dec5a1 100644 --- a/soc/xtensa/esp32_net/Kconfig.defconfig +++ b/soc/xtensa/esp32_net/Kconfig.defconfig @@ -6,6 +6,10 @@ if SOC_ESP32_NET config SOC default "esp32_net" +config SOC_TOOLCHAIN_NAME + string + default "espressif_esp32" + config MINIMAL_LIBC_OPTIMIZE_STRING_FOR_SIZE default n diff --git a/soc/xtensa/esp32_net/Kconfig.soc b/soc/xtensa/esp32_net/Kconfig.soc index 42380c6c884..b3383989477 100644 --- a/soc/xtensa/esp32_net/Kconfig.soc +++ b/soc/xtensa/esp32_net/Kconfig.soc @@ -7,6 +7,7 @@ config SOC_ESP32_NET select CLOCK_CONTROL select CLOCK_CONTROL_ESP32 select DYNAMIC_INTERRUPTS + select HAS_ESPRESSIF_HAL if SOC_ESP32_NET