diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/CMakeLists.txt b/boards/heltec/heltec_wireless_stick_lite_v3/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/CMakeLists.txt rename to boards/heltec/heltec_wireless_stick_lite_v3/CMakeLists.txt diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig new file mode 100644 index 00000000000..fc8b7634c1d --- /dev/null +++ b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig @@ -0,0 +1,6 @@ +# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HELTEC_WIRELESS_STICK_LITE_V3 + select SOC_ESP32S3_PROCPU if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU + select SOC_ESP32S3_APPCPU if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_APPCPU diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig similarity index 59% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.defconfig rename to boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig index ea79f62e2fa..82915e44b94 100644 --- a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.defconfig +++ b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig @@ -4,12 +4,7 @@ # Copyright (c) 2023 The Zephyr Project Contributors # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "heltec_wireless_stick_lite_v3" - depends on BOARD_HELTEC_WIRELESS_STICK_LITE - -config ENTROPY_GENERATOR - default y +if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU config HEAP_MEM_POOL_ADD_SIZE_BOARD int @@ -21,3 +16,12 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD choice BT_HCI_BUS_TYPE default BT_ESP32 if BT endchoice + +endif # BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU + +if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_APPCPU + +config HEAP_MEM_POOL_ADD_SIZE_BOARD + default 256 + +endif # BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_APPCPU diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.board b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.heltec_wireless_stick_lite_v3 similarity index 55% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.board rename to boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.heltec_wireless_stick_lite_v3 index a590916109d..d868ea29de2 100644 --- a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.board +++ b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.heltec_wireless_stick_lite_v3 @@ -4,10 +4,5 @@ # Copyright (c) 2023 The Zephyr Project Contributors # SPDX-License-Identifier: Apache-2.0 -config BOARD_HELTEC_WIRELESS_STICK_LITE - bool "Heltec Wireless Stick Lite (V3) Board" - depends on SOC_SERIES_ESP32S3 - -choice SOC_PART_NUMBER - default SOC_ESP32S3_FN8 -endchoice +config BOARD_HELTEC_WIRELESS_STICK_LITE_V3 + select SOC_ESP32S3_FN8 diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.sysbuild b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.sysbuild similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/Kconfig.sysbuild rename to boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.sysbuild diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/board.cmake b/boards/heltec/heltec_wireless_stick_lite_v3/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/board.cmake rename to boards/heltec/heltec_wireless_stick_lite_v3/board.cmake diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/board.yml b/boards/heltec/heltec_wireless_stick_lite_v3/board.yml new file mode 100644 index 00000000000..12cb133cb4f --- /dev/null +++ b/boards/heltec/heltec_wireless_stick_lite_v3/board.yml @@ -0,0 +1,5 @@ +board: + name: heltec_wireless_stick_lite_v3 + vendor: heltec + socs: + - name: esp32s3 diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/board_init.c b/boards/heltec/heltec_wireless_stick_lite_v3/board_init.c similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/board_init.c rename to boards/heltec/heltec_wireless_stick_lite_v3/board_init.c diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3.webp b/boards/heltec/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3.webp similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3.webp rename to boards/heltec/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3.webp diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3_pinout.webp b/boards/heltec/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3_pinout.webp similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3_pinout.webp rename to boards/heltec/heltec_wireless_stick_lite_v3/doc/heltec_wireless_stick_lite_v3_pinout.webp diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/index.rst b/boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst similarity index 97% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/index.rst rename to boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst index 24170d4cb1b..987eeb9f0f1 100644 --- a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/doc/index.rst +++ b/boards/heltec/heltec_wireless_stick_lite_v3/doc/index.rst @@ -208,9 +208,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 @@ -242,7 +242,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: heltec_wireless_stick_lite_v3 + :board: heltec_wireless_stick_lite_v3/esp32s3/procpu :goals: build The usual ``flash`` target will work with the ``heltec_wireless_stick_lite_v3`` board @@ -251,7 +251,7 @@ application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: heltec_wireless_stick_lite_v3 + :board: heltec_wireless_stick_lite_v3/esp32s3/procpu :goals: flash Open the serial monitor using the following command: @@ -283,7 +283,7 @@ Here is an example for building the :ref:`hello_world` application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: heltec_wireless_stick_lite_v3 + :board: heltec_wireless_stick_lite_v3/esp32s3/procpu :goals: build flash :gen-args: -DOPENOCD= -DOPENOCD_DEFAULT_PATH= @@ -291,7 +291,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: heltec_wireless_stick_lite_v3 + :board: heltec_wireless_stick_lite_v3/esp32s3/procpu :goals: debug References diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3-pinctrl.dtsi b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3-pinctrl.dtsi rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3-pinctrl.dtsi diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.dts b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.dts new file mode 100644 index 00000000000..6c49e64e8d1 --- /dev/null +++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.dts @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2023 Espressif Systems (Shanghai) Co., Ltd. + * + * SPDX-License-Identifier: Apache-2.0 + */ +/dts-v1/; + +#include +/ { + model = "Heltec Wireless Stick Lite V3 APPCPU"; + compatible = "espressif,esp32s3"; + + chosen { + zephyr,sram = &sram0; + zephyr,ipc_shm = &shm0; + zephyr,ipc = &ipm0; + }; +}; + +&cpu0 { + clock-frequency = ; +}; + +&cpu1 { + clock-frequency = ; +}; + +&trng0 { + status = "okay"; +}; + +&ipm0 { + status = "okay"; +}; + +&flash0 { + status = "okay"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* Reserve 64kB for the bootloader */ + boot_partition: partition@0 { + label = "mcuboot"; + reg = <0x00000000 0x00010000>; + 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/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.yaml b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.yaml new file mode 100644 index 00000000000..a465da8f94d --- /dev/null +++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu.yaml @@ -0,0 +1,27 @@ +identifier: heltec_wireless_stick_lite_v3/esp32s3/appcpu +name: ESP32-S3 DevKitM 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: heltec diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu_defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_appcpu_defconfig new file mode 100644 index 00000000000..100bb882567 --- /dev/null +++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_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/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3.dts b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.dts similarity index 98% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3.dts rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.dts index 9a23a008c2f..38d870a6fbb 100644 --- a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3.dts +++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.dts @@ -14,7 +14,7 @@ #include / { - model = "heltec_wireless_stick_lite_v3"; + model = "Heltec Wireless Stick Lite V3 PROCPU"; compatible = "espressif,esp32s3"; aliases { diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3.yaml b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.yaml similarity index 77% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3.yaml rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.yaml index 05c89b6d984..91221f8616b 100644 --- a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3.yaml +++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu.yaml @@ -1,4 +1,4 @@ -identifier: heltec_wireless_stick_lite_v3 +identifier: heltec_wireless_stick_lite_v3/esp32s3/procpu name: Heltec Wireless Stick Lite (V3) type: mcu arch: xtensa @@ -20,3 +20,4 @@ testing: ignore_tags: - net - bluetooth +vendor: heltec diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu_defconfig similarity index 72% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_defconfig rename to boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu_defconfig index a32ddde0422..2dfe1853d5c 100644 --- a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_defconfig +++ b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_esp32s3_procpu_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_HELTEC_WIRELESS_STICK_LITE=y -CONFIG_SOC_SERIES_ESP32S3=y - CONFIG_MAIN_STACK_SIZE=2048 CONFIG_CLOCK_CONTROL=y diff --git a/boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/support/openocd.cfg b/boards/heltec/heltec_wireless_stick_lite_v3/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/xtensa/heltec_wireless_stick_lite_v3/support/openocd.cfg rename to boards/heltec/heltec_wireless_stick_lite_v3/support/openocd.cfg