boards: xtensa: yd_esp32: Convert to v2

sylvioalves · nordicjm · commit ffb1d82e17e0 · 2024-03-01T08:53:34.000Z
Converts the board to hwmv2

Signed-off-by: Sylvio Alves &lt;sylvio.alves@espressif.com&gt;
diff --git a/boards/vcc-gnd/index.rst b/boards/vcc-gnd/index.rst
@@ -0,0 +1,10 @@
+.. _boards-vcc-gnd:
+
+VCC-GND
+#######
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/vcc-gnd/yd_esp32/Kconfig b/boards/vcc-gnd/yd_esp32/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_YD_ESP32
+	select SOC_ESP32_PROCPU if BOARD_YD_ESP32_ESP32_PROCPU
+	select SOC_ESP32_APPCPU if BOARD_YD_ESP32_ESP32_APPCPU
diff --git a/boards/vcc-gnd/yd_esp32/Kconfig.defconfig b/boards/vcc-gnd/yd_esp32/Kconfig.defconfig
@@ -3,12 +3,7 @@
 # Copyright (c) 2023 Julio Cesar <hi@jcsx.dev>
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD
-	default "yd_esp32"
-	depends on BOARD_YD_ESP32
-
-config ENTROPY_GENERATOR
-	default y
+if BOARD_YD_ESP32_ESP32_PROCPU
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
@@ -20,3 +15,12 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 choice BT_HCI_BUS_TYPE
 	default BT_ESP32 if BT
 endchoice
+
+endif # BOARD_YD_ESP32_ESP32_PROCPU
+
+if BOARD_YD_ESP32_ESP32_APPCPU
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	default 256
+
+endif # BOARD_YD_ESP32_ESP32_PROCPU
diff --git a/boards/vcc-gnd/yd_esp32/Kconfig.sysbuild b/boards/vcc-gnd/yd_esp32/Kconfig.sysbuild
diff --git a/boards/vcc-gnd/yd_esp32/Kconfig.yd_esp32 b/boards/vcc-gnd/yd_esp32/Kconfig.yd_esp32
@@ -4,9 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_YD_ESP32
-	bool "YD-ESP32 Development Board"
-	depends on SOC_SERIES_ESP32
-
-choice SOC_PART_NUMBER
-	default SOC_ESP32_WROOM_32UE_N4
-endchoice
+	select SOC_ESP32_WROOM_32UE_N4
diff --git a/boards/vcc-gnd/yd_esp32/board.cmake b/boards/vcc-gnd/yd_esp32/board.cmake
diff --git a/boards/vcc-gnd/yd_esp32/board.yml b/boards/vcc-gnd/yd_esp32/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: yd_esp32
+  vendor: vcc-gnd
+  socs:
+  - name: esp32
diff --git a/boards/vcc-gnd/yd_esp32/doc/img/yd_esp32.png b/boards/vcc-gnd/yd_esp32/doc/img/yd_esp32.png
diff --git a/boards/vcc-gnd/yd_esp32/doc/index.rst b/boards/vcc-gnd/yd_esp32/doc/index.rst
@@ -169,9 +169,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
@@ -203,7 +203,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: yd_esp32
+   :board: yd_esp32/esp32/procpu
    :goals: build
 
 The usual ``flash`` target will work with the ``yd_esp32`` board
@@ -212,7 +212,7 @@ application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: yd_esp32
+   :board: yd_esp32/esp32/procpu
    :goals: flash
 
 Open the serial monitor using the following command:
@@ -237,7 +237,7 @@ Here is an example of how to test it using the :zephyr:code-sample:`led-ws2812`
 
 .. zephyr-app-commands::
    :zephyr-app: samples/drivers/led_ws2812
-   :board: yd_esp32
+   :board: yd_esp32/esp32/procpu
    :goals: flash
 
 
@@ -278,14 +278,14 @@ Here is an example for building the :ref:`hello_world` application.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: yd_esp32
+   :board: yd_esp32/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: yd_esp32
+   :board: yd_esp32/esp32/procpu
    :goals: debug
 
 Note on Debugging with GDB Stub
diff --git a/boards/vcc-gnd/yd_esp32/support/openocd.cfg b/boards/vcc-gnd/yd_esp32/support/openocd.cfg
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32-pinctrl.dtsi b/boards/vcc-gnd/yd_esp32/yd_esp32-pinctrl.dtsi
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.dts b/boards/vcc-gnd/yd_esp32/yd_esp32_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 = "VCC-GND Studio YD-ESP32 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>;
+		};
+	};
+};
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.yaml b/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu.yaml
@@ -0,0 +1,27 @@
+identifier: yd_esp32/esp32/appcpu
+name: ESP32 DEVKITC WROVER APPCPU
+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
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_appcpu_defconfig b/boards/vcc-gnd/yd_esp32/yd_esp32_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
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.dts b/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.dts
@@ -9,7 +9,7 @@
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 
 / {
-	model = "VCC-GND Studio YD-ESP32";
+	model = "VCC-GND Studio YD-ESP32 PROCPU";
 	compatible = "espressif,esp32";
 
 	aliases {
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.yaml b/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu.yaml
@@ -1,4 +1,4 @@
-identifier: yd_esp32
+identifier: yd_esp32/esp32/procpu
 name: YD-ESP32
 type: mcu
 arch: xtensa
@@ -21,4 +21,4 @@ testing:
   ignore_tags:
     - net
     - bluetooth
-vendor: espressif
+vendor: vcc-gnd
diff --git a/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu_defconfig b/boards/vcc-gnd/yd_esp32/yd_esp32_esp32_procpu_defconfig
@@ -1,9 +1,6 @@
 # Copyright (c) 2023 Julio Cesar <hi@jcsx.dev>
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_BOARD_YD_ESP32=y
-CONFIG_SOC_SERIES_ESP32=y
-
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
