soc: xtensa,riscv: esp32xx: refactor folder structure

Refactor the ESP32 target SOCs together with all related boards. Most braking changes includes: - changing the CONFIG_SOC_ESP32* to refer to the actual soc line (esp32,esp32s2,esp32s3,esp32c3) - replacing CONFIG_SOC with the CONFIG_SOC_SERIES - creating CONFIG_SOC_FAMILY_ESP32 to embrace all the ESP32 across all used architectures - introducing CONFIG_SOC_PART_NUMBER_* to provide a SOC model config - introducing the 'common' folder to hide all commonly used configs and files. - updating west.yml to reflect previous changes in hal Signed-off-by: Marek Matej <marek.matej@espressif.com>
zephyrproject-rtos · Jul 25, 2023 · 2d37be1 · 2d37be1
1 parent 690c8b1
commit 2d37be1
Show file tree

Hide file tree

Showing 154 changed files with 1,035 additions and 1,622 deletions.
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
@@ -594,7 +594,7 @@ if BUILD_OUTPUT_UF2
 
 config BUILD_OUTPUT_UF2_FAMILY_ID
  string "UF2 device family ID"
- default "0x1c5f21b0" if SOC_ESP32
+ default "0x1c5f21b0" if SOC_SERIES_ESP32
  default "0x621e937a" if SOC_NRF52833_QIAA
  default "0xada52840" if SOC_NRF52840_QIAA
  default "0x4fb2d5bd" if SOC_SERIES_IMX_RT

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
@@ -46,7 +46,7 @@ config XTENSA_USE_CORE_CRT1
 config XTENSA_ENABLE_BACKTRACE
  bool "Backtrace on panic exception"
  default y
- depends on SOC_ESP32 || SOC_FAMILY_INTEL_ADSP
+ depends on SOC_SERIES_ESP32 || SOC_FAMILY_INTEL_ADSP
  help
  Enable this config option to print backtrace on panic exception
 

diff --git a/arch/xtensa/core/coredump.c b/arch/xtensa/core/coredump.c
@@ -109,13 +109,13 @@ void arch_coredump_info_dump(const z_arch_esf_t *esf)
 
  #if CONFIG_SOC_XTENSA_SAMPLE_CONTROLLER
  arch_blk.soc = XTENSA_SOC_SAMPLE_CONTROLLER;
- #elif CONFIG_SOC_ESP32
- arch_blk.soc = XTENSA_SOC_ESP32;
  #elif CONFIG_SOC_FAMILY_INTEL_ADSP
  arch_blk.soc = XTENSA_SOC_INTEL_ADSP;
- #elif CONFIG_SOC_ESP32S2
+ #elif CONFIG_SOC_SERIES_ESP32
+ arch_blk.soc = XTENSA_SOC_ESP32;
+ #elif CONFIG_SOC_SERIES_ESP32S2
  arch_blk.soc = XTENSA_SOC_ESP32S2;
- #elif CONFIG_SOC_ESP32S3
+ #elif CONFIG_SOC_SERIES_ESP32S3
  arch_blk.soc = XTENSA_SOC_ESP32S3;
  #else
  arch_blk.soc = XTENSA_SOC_UNKNOWN;

diff --git a/arch/xtensa/core/xtensa_backtrace.c b/arch/xtensa/core/xtensa_backtrace.c
@@ -7,7 +7,7 @@
 #include "xtensa/corebits.h"
 #include "xtensa_backtrace.h"
 #include <zephyr/sys/printk.h>
-#if defined(CONFIG_SOC_ESP32)
+#if defined(CONFIG_SOC_SERIES_ESP32)
 #include "soc/soc_memory_layout.h"
 #elif defined(CONFIG_SOC_FAMILY_INTEL_ADSP)
 #include "debug_helpers.h"
@@ -34,7 +34,7 @@ static inline uint32_t z_xtensa_cpu_process_stack_pc(uint32_t pc)
 
 static inline bool z_xtensa_stack_ptr_is_sane(uint32_t sp)
 {
-#if defined(CONFIG_SOC_ESP32)
+#if defined(CONFIG_SOC_SERIES_ESP32)
  return esp_stack_ptr_is_sane(sp);
 #elif defined(CONFIG_SOC_FAMILY_INTEL_ADSP)
  return intel_adsp_ptr_is_sane(sp);
@@ -45,7 +45,7 @@ static inline bool z_xtensa_stack_ptr_is_sane(uint32_t sp)
 
 static inline bool z_xtensa_ptr_executable(const void *p)
 {
-#if defined(CONFIG_SOC_ESP32)
+#if defined(CONFIG_SOC_SERIES_ESP32)
  return esp_ptr_executable(p);
 #elif defined(CONFIG_SOC_FAMILY_INTEL_ADSP)
  return intel_adsp_ptr_executable(p);

diff --git a/boards/riscv/esp32c3_devkitm/Kconfig.board b/boards/riscv/esp32c3_devkitm/Kconfig.board
@@ -5,4 +5,8 @@
 
 config BOARD_ESP32C3_DEVKITM
  bool "ESP32C3 Devkit-M Board"
- depends on SOC_ESP32C3
+ depends on SOC_SERIES_ESP32C3
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32C3_MINI_N4
+endchoice
diff --git a/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig
@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_BOARD_ESP32C3_DEVKITM=y
-CONFIG_SOC_ESP32C3=y
+CONFIG_SOC_SERIES_ESP32C3=y
+
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_GPIO=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/riscv/icev_wireless/icev_wireless_defconfig b/boards/riscv/icev_wireless/icev_wireless_defconfig
@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_BOARD_ICEV_WIRELESS=y
-CONFIG_SOC_ESP32C3=y
+CONFIG_SOC_SERIES_ESP32C3=y
+
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_GPIO=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/riscv/stamp_c3/Kconfig.board b/boards/riscv/stamp_c3/Kconfig.board
@@ -5,4 +5,8 @@
 
 config BOARD_STAMP_C3
  bool "M5Stack STAMP-C3 Board"
- depends on SOC_ESP32C3
+ depends on SOC_SERIES_ESP32C3
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32C3_FX4
+endchoice
diff --git a/boards/riscv/stamp_c3/stamp_c3_defconfig b/boards/riscv/stamp_c3/stamp_c3_defconfig
@@ -1,12 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_BOARD_STAMP_C3=y
-CONFIG_SOC_ESP32C3=y
+CONFIG_SOC_SERIES_ESP32C3=y
+
 CONFIG_MAIN_STACK_SIZE=2048
+
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1000000
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_GPIO=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/riscv/xiao_esp32c3/Kconfig.board b/boards/riscv/xiao_esp32c3/Kconfig.board
@@ -3,4 +3,8 @@
 
 config BOARD_XIAO_ESP32C3
  bool "XIAO ESP32C3 Board"
- depends on SOC_ESP32C3
+ depends on SOC_SERIES_ESP32C3
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32C3_FX4
+endchoice
diff --git a/boards/riscv/xiao_esp32c3/xiao_esp32c3_defconfig b/boards/riscv/xiao_esp32c3/xiao_esp32c3_defconfig
@@ -1,11 +1,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 CONFIG_BOARD_XIAO_ESP32C3=y
-CONFIG_SOC_ESP32C3=y
+CONFIG_SOC_SERIES_ESP32C3=y
+
 CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
+
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 CONFIG_GPIO=y
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32_devkitc_wroom/Kconfig.board b/boards/xtensa/esp32_devkitc_wroom/Kconfig.board
@@ -3,4 +3,8 @@
 
 config BOARD_ESP32_DEVKITC_WROOM
  bool "ESP32-DEVKITC-WROOM Development Board"
- depends on SOC_ESP32
+ depends on SOC_SERIES_ESP32
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32_WROOM_32UE_N4
+endchoice
diff --git a/boards/xtensa/esp32_devkitc_wroom/esp32_devkitc_wroom_defconfig b/boards/xtensa/esp32_devkitc_wroom/esp32_devkitc_wroom_defconfig
@@ -1,22 +1,13 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
-
 CONFIG_BOARD_ESP32_DEVKITC_WROOM=y
-CONFIG_SOC_ESP32=y
+CONFIG_SOC_SERIES_ESP32=y
 
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 
-CONFIG_XTENSA_USE_CORE_CRT1=n
-
 CONFIG_GPIO=y
-
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32_devkitc_wrover/Kconfig.board b/boards/xtensa/esp32_devkitc_wrover/Kconfig.board
@@ -3,4 +3,8 @@
 
 config BOARD_ESP32_DEVKITC_WROVER
  bool "ESP32-DEVKITC-WROVER-E Development board"
- depends on SOC_ESP32
+ depends on SOC_SERIES_ESP32
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32_WROVER_E_N4R8
+endchoice
diff --git a/boards/xtensa/esp32_devkitc_wrover/esp32_devkitc_wrover_defconfig b/boards/xtensa/esp32_devkitc_wrover/esp32_devkitc_wrover_defconfig
@@ -1,22 +1,13 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
-
 CONFIG_BOARD_ESP32_DEVKITC_WROVER=y
-CONFIG_SOC_ESP32=y
+CONFIG_SOC_SERIES_ESP32=y
 
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 
-CONFIG_XTENSA_USE_CORE_CRT1=n
-
 CONFIG_GPIO=y
-
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32_ethernet_kit/Kconfig.board b/boards/xtensa/esp32_ethernet_kit/Kconfig.board
@@ -5,4 +5,8 @@
 
 config BOARD_ESP32_ETHERNET_KIT
  bool "ESP32-ETHERNET-KIT Development Board"
- depends on SOC_ESP32
+ depends on SOC_SERIES_ESP32
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32_WROVER_E_N4R8
+endchoice
diff --git a/boards/xtensa/esp32_ethernet_kit/esp32_ethernet_kit_defconfig b/boards/xtensa/esp32_ethernet_kit/esp32_ethernet_kit_defconfig
@@ -1,21 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
-
 CONFIG_BOARD_ESP32_ETHERNET_KIT=y
-CONFIG_SOC_ESP32=y
+CONFIG_SOC_SERIES_ESP32=y
 
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 
-CONFIG_XTENSA_USE_CORE_CRT1=n
-
 CONFIG_GPIO=y
-
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32_net/Kconfig.board b/boards/xtensa/esp32_net/Kconfig.board
@@ -5,4 +5,8 @@
 
 config BOARD_ESP32_NET
  bool "ESP32 Board configuration for APP_CPU"
- depends on SOC_ESP32_NET
+ depends on SOC_SERIES_ESP32_NET
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32_NET
+endchoice
diff --git a/boards/xtensa/esp32_net/esp32_net_defconfig b/boards/xtensa/esp32_net/esp32_net_defconfig
@@ -1,23 +1,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
-
 CONFIG_BOARD_ESP32_NET=y
-CONFIG_SOC_ESP32_NET=y
+CONFIG_SOC_SERIES_ESP32_NET=y
 
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=n
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 
-CONFIG_XTENSA_USE_CORE_CRT1=n
-
 CONFIG_GPIO=n
 CONFIG_GPIO_ESP32=n
 
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
 CONFIG_I2C=n
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32s2_franzininho/Kconfig.board b/boards/xtensa/esp32s2_franzininho/Kconfig.board
@@ -5,4 +5,8 @@
 
 config BOARD_ESP32S2_FRANZININHO
  bool "ESP32S2 Franzininho Board"
- depends on SOC_ESP32S2
+ depends on SOC_SERIES_ESP32S2
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32S2_WROOM
+endchoice
diff --git a/boards/xtensa/esp32s2_franzininho/esp32s2_franzininho_defconfig b/boards/xtensa/esp32s2_franzininho/esp32s2_franzininho_defconfig
@@ -1,20 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
 
 CONFIG_BOARD_ESP32S2_FRANZININHO=y
-CONFIG_SOC_ESP32S2=y
+CONFIG_SOC_SERIES_ESP32S2=y
+
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 
-CONFIG_XTENSA_USE_CORE_CRT1=n
-
 CONFIG_GPIO=y
-
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32s2_saola/Kconfig.board b/boards/xtensa/esp32s2_saola/Kconfig.board
@@ -1,8 +1,10 @@
-# ESP32S2 saola board configuration
-
-# Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ESP32S2_SAOLA
  bool "ESP32S2 Saola Board"
- depends on SOC_ESP32S2
+ depends on SOC_SERIES_ESP32S2
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32S2_WROVER_N4R2
+endchoice
diff --git a/boards/xtensa/esp32s2_saola/esp32s2_saola_defconfig b/boards/xtensa/esp32s2_saola/esp32s2_saola_defconfig
@@ -1,20 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
-
 CONFIG_BOARD_ESP32S2_SAOLA=y
-CONFIG_SOC_ESP32S2=y
+CONFIG_SOC_SERIES_ESP32S2=y
+
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
 
-CONFIG_XTENSA_USE_CORE_CRT1=n
-
 CONFIG_GPIO=y
-
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
-
-CONFIG_CLOCK_CONTROL=y
diff --git a/boards/xtensa/esp32s3_devkitm/Kconfig.board b/boards/xtensa/esp32s3_devkitm/Kconfig.board
@@ -1,8 +1,11 @@
-# ESP32S3 DevKitM board configuration
-
 # Copyright (c) 2022 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
+# ESP32S3 DevKitM board configuration
 config BOARD_ESP32S3_DEVKITM
  bool "ESP32S3 DevKitM Board"
- depends on SOC_ESP32S3
+ depends on SOC_SERIES_ESP32S3
+
+choice SOC_PART_NUMBER
+ default SOC_ESP32S3_MINI_N8
+endchoice
diff --git a/boards/xtensa/esp32s3_devkitm/esp32s3_devkitm_defconfig b/boards/xtensa/esp32s3_devkitm/esp32s3_devkitm_defconfig
@@ -1,14 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_XTENSA_RESET_VECTOR=n
 CONFIG_BOARD_ESP32S3_DEVKITM=y
-CONFIG_SOC_ESP32S3=y
+CONFIG_SOC_SERIES_ESP32S3=y
+
 CONFIG_MAIN_STACK_SIZE=2048
+
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y
-CONFIG_XTENSA_USE_CORE_CRT1=n
 CONFIG_GPIO=y
-CONFIG_GEN_ISR_TABLES=y
-CONFIG_GEN_IRQ_VECTOR_TABLE=n
 CONFIG_CLOCK_CONTROL=y