boards: xtensa: esp_wrover_kit: Convert to v2

Converts the board to hwmv2

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

boards/espressif/esp_wrover_kit/Kconfig

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

boards/espressif/esp_wrover_kit/Kconfig.defconfig

@@ -3,9 +3,7 @@
 # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD
-	default "esp_wrover_kit"
-	depends on BOARD_ESP_WROVER_KIT
+if BOARD_ESP_WROVER_KIT_ESP32_PROCPU
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
@@ -20,3 +18,12 @@ endchoice
 
 config DISK_DRIVER_SDMMC
 	default y
+
+endif # BOARD_ESP_WROVER_KIT_ESP32_PROCPU
+
+if BOARD_ESP_WROVER_KIT_ESP32_APPCPU
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	default 4096
+
+endif # BOARD_ESP_WROVER_KIT_ESP32_APPCPU

boards/espressif/esp_wrover_kit/Kconfig.esp_wrover_kit

@@ -4,9 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ESP_WROVER_KIT
-	bool "ESP-WROVER-KIT Development Board"
-	depends on SOC_SERIES_ESP32
-
-choice SOC_PART_NUMBER
-	default SOC_ESP32_WROVER_E_N4R8
-endchoice
+	select SOC_ESP32_WROVER_E_N4R8

boards/espressif/esp_wrover_kit/board.yml

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

boards/espressif/esp_wrover_kit/doc/index.rst

@@ -555,9 +555,9 @@ Zephyr build. Output is structured by the domain subdirectories:
 
   build/
   ├── hello_world
-  │   └── zephyr
-  │       ├── zephyr.elf
-  │       └── zephyr.bin
+  │   └── zephyr
+  │       ├── zephyr.elf
+  │       └── zephyr.bin
   ├── mcuboot
   │    └── zephyr
   │       ├── zephyr.elf
@@ -589,7 +589,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp_wrover_kit
+   :board: esp_wrover_kit/esp32/procpu
    :goals: build
 
 The usual ``flash`` target will work with the ``esp_wrover_kit`` board
@@ -598,7 +598,7 @@ application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp_wrover_kit
+   :board: esp_wrover_kit/esp32/procpu
    :goals: flash
 
 Open the serial monitor using the following command:
@@ -634,7 +634,7 @@ Here is an example for building the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp_wrover_kit
+   :board: esp_wrover_kit/esp32/procpu
    :goals: build flash
    :gen-args: -DOPENOCD=<path/to/bin/openocd> -DOPENOCD_DEFAULT_PATH=<path/to/openocd/share/openocd/scripts>
 
@@ -642,7 +642,7 @@ You can debug an application in the usual way. Here is an example for the :ref:`
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: esp_wrover_kit
+   :board: esp_wrover_kit/esp32/procpu
    :goals: debug
 
 .. _`OpenOCD`: https://github.com/openocd-org/openocd

boards/espressif/esp_wrover_kit/esp_wrover_kit_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-Wrover-Kit 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/esp_wrover_kit/esp_wrover_kit_esp32_appcpu.yaml

@@ -0,0 +1,27 @@
+identifier: esp_wrover_kit/esp32/appcpu
+name: ESP WROVER KIT
+type: mcu
+arch: xtensa
+toolchain:
+  - zephyr
+supported:
+  - uart
+testing:
+  ignore_tags:
+    - net
+    - bluetooth
+    - flash
+    - cpp
+    - posix
+    - watchdog
+    - logging
+    - kernel
+    - pm
+    - gpio
+    - crypto
+    - eeprom
+    - heap
+    - cmsis_rtos
+    - jwt
+    - zdsp
+vendor: espressif

boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_appcpu_defconfig

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_CLOCK_CONTROL=y
+CONFIG_MINIMAL_LIBC=y

boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu.dts

@@ -9,7 +9,7 @@
 #include "esp_wrover_kit-pinctrl.dtsi"
 
 / {
-	model = "esp32";
+	model = "Espressif ESP32-Wrover-Kit PROCPU";
 	compatible = "espressif,esp32";
 
 	aliases {

boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu.yaml

@@ -1,4 +1,4 @@
-identifier: esp_wrover_kit
+identifier: esp_wrover_kit/esp32/procpu
 name: ESP WROVER KIT
 type: mcu
 arch: xtensa

boards/espressif/esp_wrover_kit/esp_wrover_kit_esp32_procpu_defconfig

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_BOARD_ESP_WROVER_KIT=y
-CONFIG_SOC_SERIES_ESP32=y
-
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y