zephyrproject-rtos · carlescufi · Jul 25, 2023 · Jun 9, 2023 · Jun 8, 2023 · Jul 12, 2023
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/deprecated.cmake b/boards/deprecated.cmake
@@ -20,3 +20,4 @@ set(nrf9160_innblue21ns_DEPRECATED nrf9160_innblue21_ns)
 set(nrf9160_innblue22ns_DEPRECATED nrf9160_innblue22_ns)
 set(sparkfun_thing_plus_nrf9160ns_DEPRECATED sparkfun_thing_plus_nrf9160_ns)
 set(thingy53_nrf5340_cpuappns_DEPRECATED thingy53_nrf5340_cpuapp_ns)
+set(esp32_DEPRECATED esp32_devkitc_wrover)
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.dts b/boards/riscv/esp32c3_devkitm/esp32c3_devkitm.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include <espressif/esp32c3.dtsi>
+#include <espressif/esp32c3/esp32c3_mini_n4.dtsi>
 #include "esp32c3_devkitm-pinctrl.dtsi"
 
 / {

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.dts b/boards/riscv/icev_wireless/icev_wireless.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include <espressif/esp32c3.dtsi>
+#include <espressif/esp32c3/esp32c3_fx4.dtsi>
 #include "icev_wireless-pinctrl.dtsi"
 
 / {

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
@@ -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
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include <espressif/esp32c3.dtsi>
+#include <espressif/esp32c3/esp32c3_fx4.dtsi>
 #include "stamp_c3-pinctrl.dtsi"
 
 / {

@@ -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.dts b/boards/riscv/xiao_esp32c3/xiao_esp32c3.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include <espressif/esp32c3.dtsi>
+#include <espressif/esp32c3/esp32c3_fx4.dtsi>
 #include "xiao_esp32c3-pinctrl.dtsi"
 #include "seeed_xiao_connector.dtsi"
 

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/Kconfig.board b/boards/xtensa/esp32/Kconfig.board
diff --git a/boards/xtensa/esp32/esp32_defconfig b/boards/xtensa/esp32/esp32_defconfig
diff --git a/boards/xtensa/esp32_devkitc_wroom/Kconfig.board b/boards/xtensa/esp32_devkitc_wroom/Kconfig.board
@@ -0,0 +1,10 @@
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ESP32_DEVKITC_WROOM
+	bool "ESP32-DEVKITC-WROOM Development Board"
+	depends on SOC_SERIES_ESP32
+
+choice SOC_PART_NUMBER
+	default SOC_ESP32_WROOM_32UE_N4
+endchoice
diff --git a/boards/xtensa/esp32/Kconfig.defconfig → ...nsa/esp32_devkitc_wroom/Kconfig.defconfig b/boards/xtensa/esp32/Kconfig.defconfig → ...nsa/esp32_devkitc_wroom/Kconfig.defconfig
@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD
-	default "esp32"
-	depends on BOARD_ESP32
+	default "esp32_devkitc_wroom"
+	depends on BOARD_ESP32_DEVKITC_WROOM
 
 config ENTROPY_GENERATOR
 	default y

diff --git a/boards/xtensa/esp32/Kconfig.sysbuild → ...ensa/esp32_devkitc_wroom/Kconfig.sysbuild b/boards/xtensa/esp32/Kconfig.sysbuild → ...ensa/esp32_devkitc_wroom/Kconfig.sysbuild
diff --git a/boards/xtensa/esp32/board.cmake → ...ds/xtensa/esp32_devkitc_wroom/board.cmake b/boards/xtensa/esp32/board.cmake → ...ds/xtensa/esp32_devkitc_wroom/board.cmake
@@ -1,8 +1,10 @@
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
 if(NOT "${OPENOCD}" MATCHES "^${ESPRESSIF_TOOLCHAIN_PATH}/.*")
   set(OPENOCD OPENOCD-NOTFOUND)
 endif()
+
 find_program(OPENOCD openocd PATHS ${ESPRESSIF_TOOLCHAIN_PATH}/openocd-esp32/bin NO_DEFAULT_PATH)
 
 include(${ZEPHYR_BASE}/boards/common/esp32.board.cmake)

diff --git a/boards/xtensa/esp32_devkitc_wroom/doc/img/esp32_devkitc_wroom.jpg b/boards/xtensa/esp32_devkitc_wroom/doc/img/esp32_devkitc_wroom.jpg