boards: xtensa: esp32_devkitc_wroom: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boards/boards_legacy/xtensa/esp32_devkitc_wroom/Kconfig.board

@@ -1,14 +0,0 @@
-# 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
-
-config BOARD_ESP32_DEVKITC_WROOM_APPCPU
-	bool "ESP32 Board configuration for APPCPU (core 1)."
-	depends on SOC_SERIES_ESP32 && SOC_ESP32_APPCPU
-
-choice SOC_PART_NUMBER
-	default SOC_ESP32_WROOM_32UE_N4
-endchoice

boards/boards_legacy/xtensa/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu.dts

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-/dts-v1/;
-
-#include <espressif/esp32/esp32_appcpu.dtsi>
-
-/ {
-	model = "esp32_wroom_appcpu";
-	compatible = "espressif,esp32_appcpu";
-
-	chosen {
-		zephyr,sram = &sram0;
-		zephyr,ipc_shm = &shm0;
-		zephyr,ipc = &ipm0;
-	};
-};
-
-&cpu0 {
-	clock-frequency = <ESP32_CLK_CPU_240M>;
-};
-
-&cpu1 {
-	clock-frequency = <ESP32_CLK_CPU_240M>;
-};
-
-&trng0 {
-	status = "okay";
-};

boards/boards_legacy/xtensa/esp32_devkitc_wroom/esp32_devkitc_wroom_appcpu_defconfig

@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_SERIES_ESP32=y
-CONFIG_SOC_ESP32_APPCPU=y
-CONFIG_BOARD_ESP32_DEVKITC_WROOM_APPCPU=y
-
-CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_CLOCK_CONTROL=y
-CONFIG_MINIMAL_LIBC=y

boards/espressif/esp32_devkitc_wroom/Kconfig

@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ESP32_DEVKITC_WROOM
+	select SOC_ESP32_PROCPU if BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
+	select SOC_ESP32_APPCPU if BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU

boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig

@@ -3,10 +3,7 @@
 # Copyright (c) 2017 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_ESP32_DEVKITC_WROOM
-
-config BOARD
-	default "esp32_devkitc_wroom"
+if BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
@@ -19,20 +16,11 @@ choice BT_HCI_BUS_TYPE
 	default BT_ESP32 if BT
 endchoice
 
-endif # BOARD_ESP32_DEVKITC_WROOM
+endif # BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
 
-if BOARD_ESP32_DEVKITC_WROOM_APPCPU
-
-config BOARD
-	default "esp32_devkitc_wroom_appcpu"
+if BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 4096
 
-config KERNEL_BIN_NAME
-	default "esp32_appcpu_firmware"
-
-endif # BOARD_ESP32_DEVKITC_WROOM_APPCPU
-
-config ENTROPY_GENERATOR
-	default y
+endif # BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU

boards/espressif/esp32_devkitc_wroom/Kconfig.esp32_devkitc_wroom

@@ -0,0 +1,5 @@
+# Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ESP32_DEVKITC_WROOM
+	select SOC_ESP32_WROOM_32UE_N4

boards/espressif/esp32_devkitc_wroom/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: esp32_devkitc_wroom
+  vendor: espressif
+  socs:
+  - name: esp32

boards/espressif/esp32_devkitc_wroom/doc/index.rst

@@ -122,7 +122,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32_devkitc_wroom
+   :board: esp32_devkitc_wroom/esp32/procpu
    :goals: build
 
 The usual ``flash`` target will work with the ``esp32_devkitc_wroom`` board
@@ -131,7 +131,7 @@ application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32_devkitc_wroom
+   :board: esp32_devkitc_wroom/esp32/procpu
    :goals: flash
 
 Open the serial monitor using the following command:
@@ -183,14 +183,14 @@ Here is an example for building the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32_devkitc_wroom
+   :board: esp32_devkitc_wroom/esp32/procpu
    :goals: build flash
 
 You can debug an application in the usual way. Here is an example for the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp32_devkitc_wroom
+   :board: esp32_devkitc_wroom/esp32/procpu
    :goals: debug
 
 Note on Debugging with GDB Stub

boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu.dts

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/dts-v1/;
+
+#include <espressif/esp32/esp32_appcpu.dtsi>
+
+/ {
+	model = "Espressif ESP32-DevkitC APPCPU";
+	compatible = "espressif,esp32";
+
+	chosen {
+		zephyr,sram = &sram0;
+		zephyr,ipc_shm = &shm0;
+		zephyr,ipc = &ipm0;
+	};
+};
+
+&cpu0 {
+	clock-frequency = <ESP32_CLK_CPU_240M>;
+};
+
+&cpu1 {
+	clock-frequency = <ESP32_CLK_CPU_240M>;
+};
+
+&ipm0 {
+	status = "okay";
+};
+
+&trng0 {
+	status = "okay";
+};
+
+&flash0 {
+	status = "okay";
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/* Reserve 60kB for the bootloader */
+		boot_partition: partition@1000 {
+			label = "mcuboot";
+			reg = <0x00001000 0x0000F000>;
+			read-only;
+		};
+
+		/* Reserve 1024kB for the application in slot 0 */
+		slot0_partition: partition@10000 {
+			label = "image-0";
+			reg = <0x00010000 0x00100000>;
+		};
+
+		/* Reserve 1024kB for the application in slot 1 */
+		slot1_partition: partition@110000 {
+			label = "image-1";
+			reg = <0x00110000 0x00100000>;
+		};
+
+		/* Reserve 256kB for the scratch partition */
+		scratch_partition: partition@210000 {
+			   label = "image-scratch";
+			   reg = <0x00210000 0x00040000>;
+		};
+
+		storage_partition: partition@250000 {
+			label = "storage";
+			reg = <0x00250000 0x00006000>;
+		};
+	};
+};

boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu.yaml

@@ -1,4 +1,4 @@
-identifier: esp32_devkitc_wroom_appcpu
+identifier: esp32_devkitc_wroom/esp32/appcpu
 name: ESP32 DEVKITC WROOM APPCPU
 type: mcu
 arch: xtensa

boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_appcpu_defconfig

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_CLOCK_CONTROL=y
+CONFIG_MINIMAL_LIBC=y
+CONFIG_CONSOLE=n
+CONFIG_SERIAL=n
+CONFIG_UART_CONSOLE=n
+CONFIG_GPIO=n

boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu.dts

@@ -11,7 +11,7 @@
 #include <zephyr/dt-bindings/input/esp32-touch-sensor-input.h>
 
 / {
-	model = "Espressif ESP32-DEVKITC-WROOM-32D";
+	model = "Espressif ESP32-DevkitC PROCPU";
 	compatible = "espressif,esp32";
 
 	aliases {

boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu.yaml

@@ -1,4 +1,4 @@
-identifier: esp32_devkitc_wroom
+identifier: esp32_devkitc_wroom/esp32/procpu
 name: ESP32-DevkitC-WROOM-32D
 type: mcu
 arch: xtensa

boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_esp32_procpu_defconfig

@@ -1,9 +1,6 @@
 # Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_BOARD_ESP32_DEVKITC_WROOM=y
-CONFIG_SOC_SERIES_ESP32=y
-
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y