diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/CMakeLists.txt b/boards/espressif/esp32_ethernet_kit/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/CMakeLists.txt rename to boards/espressif/esp32_ethernet_kit/CMakeLists.txt diff --git a/boards/espressif/esp32_ethernet_kit/Kconfig b/boards/espressif/esp32_ethernet_kit/Kconfig new file mode 100644 index 00000000000..0df985354cc --- /dev/null +++ b/boards/espressif/esp32_ethernet_kit/Kconfig @@ -0,0 +1,6 @@ +# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_ESP32_ETHERNET_KIT + select SOC_ESP32_PROCPU if BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU + select SOC_ESP32_APPCPU if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.defconfig b/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig similarity index 65% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.defconfig rename to boards/espressif/esp32_ethernet_kit/Kconfig.defconfig index 8797780b74e..e7f2edb7c05 100644 --- a/boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.defconfig +++ b/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig @@ -3,9 +3,7 @@ # Copyright (c) 2022 Grant Ramsay # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp32_ethernet_kit" - depends on BOARD_ESP32_ETHERNET_KIT +if BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU config ESP_SPIRAM default y @@ -14,9 +12,6 @@ choice SPIRAM_TYPE default SPIRAM_TYPE_ESPPSRAM64 endchoice -config ENTROPY_GENERATOR - default y - config HEAP_MEM_POOL_ADD_SIZE_BOARD int default 65535 if WIFI && BT @@ -27,3 +22,12 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD choice BT_HCI_BUS_TYPE default BT_ESP32 if BT endchoice + +endif # BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU + +if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU + +config HEAP_MEM_POOL_ADD_SIZE_BOARD + default 4096 + +endif # BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.board b/boards/espressif/esp32_ethernet_kit/Kconfig.esp32_ethernet_kit similarity index 55% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.board rename to boards/espressif/esp32_ethernet_kit/Kconfig.esp32_ethernet_kit index 28a8995bbdf..746c7763fda 100644 --- a/boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.board +++ b/boards/espressif/esp32_ethernet_kit/Kconfig.esp32_ethernet_kit @@ -4,9 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_ESP32_ETHERNET_KIT - bool "ESP32-ETHERNET-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 diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.sysbuild b/boards/espressif/esp32_ethernet_kit/Kconfig.sysbuild similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/Kconfig.sysbuild rename to boards/espressif/esp32_ethernet_kit/Kconfig.sysbuild diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/board.cmake b/boards/espressif/esp32_ethernet_kit/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/board.cmake rename to boards/espressif/esp32_ethernet_kit/board.cmake diff --git a/boards/espressif/esp32_ethernet_kit/board.yml b/boards/espressif/esp32_ethernet_kit/board.yml new file mode 100644 index 00000000000..747690f38a6 --- /dev/null +++ b/boards/espressif/esp32_ethernet_kit/board.yml @@ -0,0 +1,5 @@ +board: + name: esp32_ethernet_kit + vendor: espressif + socs: + - name: esp32 diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/board_init.c b/boards/espressif/esp32_ethernet_kit/board_init.c similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/board_init.c rename to boards/espressif/esp32_ethernet_kit/board_init.c diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-a-v1.2-layout.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-a-v1.2-layout.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-a-v1.2-layout.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-a-v1.2-layout.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-b-v1.0-layout.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-b-v1.0-layout.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-b-v1.0-layout.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-b-v1.0-layout.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-from-phy.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-from-phy.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-from-phy.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-from-phy.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-to-phy.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-to-phy.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-to-phy.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-rmii-clk-to-phy.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.1-block-diagram.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.1-block-diagram.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.1-block-diagram.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.1-block-diagram.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2-overview.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2-overview.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2-overview.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2-overview.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2.jpg b/boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2.jpg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2.jpg rename to boards/espressif/esp32_ethernet_kit/doc/img/esp32-ethernet-kit-v1.2.jpg diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/index.rst b/boards/espressif/esp32_ethernet_kit/doc/index.rst similarity index 98% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/index.rst rename to boards/espressif/esp32_ethernet_kit/doc/index.rst index 7159681dccd..fb0bd9aa425 100644 --- a/boards/boards_legacy/xtensa/esp32_ethernet_kit/doc/index.rst +++ b/boards/espressif/esp32_ethernet_kit/doc/index.rst @@ -490,9 +490,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 @@ -525,7 +525,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32_ethernet_kit + :board: esp32_ethernet_kit/esp32/procpu :goals: build The usual ``flash`` target will work with the ``esp32_ethernet_kit`` board @@ -534,7 +534,7 @@ application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32_ethernet_kit + :board: esp32_ethernet_kit/esp32/procpu :goals: flash Open the serial monitor using the following command: @@ -566,7 +566,7 @@ Here is an example for building the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: esp32_ethernet_kit + :board: esp32_ethernet_kit/esp32/procpu :goals: build flash :gen-args: -DOPENOCD= -DOPENOCD_DEFAULT_PATH= @@ -574,7 +574,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: esp32_ethernet_kit + :board: esp32_ethernet_kit/esp32/procpu :goals: debug diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit-pinctrl.dtsi diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.dts new file mode 100644 index 00000000000..c5e1217b25c --- /dev/null +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_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 + +/ { + model = "Espressif ESP32-Ethernet-Kit APPCPU"; + compatible = "espressif,esp32"; + + chosen { + zephyr,sram = &sram0; + zephyr,ipc_shm = &shm0; + zephyr,ipc = &ipm0; + }; +}; + +&cpu0 { + clock-frequency = ; +}; + +&cpu1 { + clock-frequency = ; +}; + +&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/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.yaml b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.yaml new file mode 100644 index 00000000000..1984dea8da3 --- /dev/null +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu.yaml @@ -0,0 +1,27 @@ +identifier: esp32_ethernet_kit/esp32/appcpu +name: ESP32 ETHERNET 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 diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu_defconfig b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_appcpu_defconfig new file mode 100644 index 00000000000..100bb882567 --- /dev/null +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_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 diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.dts similarity index 97% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit.dts rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.dts index 50b01b88b2f..7e8310c9605 100644 --- a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit.dts +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.dts @@ -9,7 +9,7 @@ #include "esp32_ethernet_kit-pinctrl.dtsi" / { - model = "esp32"; + model = "Espressif ESP32-Ethernet-Kit PROCPU"; compatible = "espressif,esp32"; aliases { diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit.yaml b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.yaml similarity index 81% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit.yaml rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.yaml index 8f1167e1fac..d7d4958d2e7 100644 --- a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit.yaml +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu.yaml @@ -1,4 +1,4 @@ -identifier: esp32_ethernet_kit +identifier: esp32_ethernet_kit/esp32/procpu name: ESP32 ETHERNET KIT type: mcu arch: xtensa diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit_defconfig b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu_defconfig similarity index 69% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit_defconfig rename to boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu_defconfig index a9c99bec06b..f029cac9e9e 100644 --- a/boards/boards_legacy/xtensa/esp32_ethernet_kit/esp32_ethernet_kit_defconfig +++ b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_esp32_procpu_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_ESP32_ETHERNET_KIT=y -CONFIG_SOC_SERIES_ESP32=y - CONFIG_MAIN_STACK_SIZE=2048 CONFIG_CONSOLE=y diff --git a/boards/boards_legacy/xtensa/esp32_ethernet_kit/support/openocd.cfg b/boards/espressif/esp32_ethernet_kit/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/xtensa/esp32_ethernet_kit/support/openocd.cfg rename to boards/espressif/esp32_ethernet_kit/support/openocd.cfg