From 9d81e417be15b1e6b9beecc87549716b5b7c8e08 Mon Sep 17 00:00:00 2001 From: Sylvio Alves Date: Sun, 25 Feb 2024 18:08:43 -0300 Subject: [PATCH] boards: xtensa: m5stack_stamps3: Convert to v2 Converts the board to hwmv2 Signed-off-by: Sylvio Alves --- .../xtensa/m5stack_stamps3/Kconfig.defconfig | 27 ------- boards/m5stack/m5stack_stamps3/Kconfig | 6 ++ .../m5stack/m5stack_stamps3/Kconfig.defconfig | 28 +++++++ .../m5stack_stamps3/Kconfig.m5stack_stamps3} | 7 +- .../m5stack_stamps3/board.cmake | 0 boards/m5stack/m5stack_stamps3/board.yml | 5 ++ .../doc/img/m5stack_stamps3.webp | Bin .../doc/img/m5stack_stamps3_header.webp | Bin .../m5stack_stamps3/doc/index.rst | 4 +- .../m5stack_stamps3-pinctrl.dtsi | 0 .../m5stack_stamps3_connectors.dtsi | 0 .../m5stack_stamps3_esp32s3_appcpu.dts | 73 ++++++++++++++++++ .../m5stack_stamps3_esp32s3_appcpu.yaml | 27 +++++++ .../m5stack_stamps3_esp32s3_appcpu_defconfig | 5 ++ .../m5stack_stamps3_esp32s3_procpu.dts} | 2 +- .../m5stack_stamps3_esp32s3_procpu.yaml} | 2 +- .../m5stack_stamps3_esp32s3_procpu_defconfig} | 3 - 17 files changed, 149 insertions(+), 40 deletions(-) delete mode 100644 boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.defconfig create mode 100644 boards/m5stack/m5stack_stamps3/Kconfig create mode 100644 boards/m5stack/m5stack_stamps3/Kconfig.defconfig rename boards/{boards_legacy/xtensa/m5stack_stamps3/Kconfig.board => m5stack/m5stack_stamps3/Kconfig.m5stack_stamps3} (56%) rename boards/{boards_legacy/xtensa => m5stack}/m5stack_stamps3/board.cmake (100%) create mode 100644 boards/m5stack/m5stack_stamps3/board.yml rename boards/{boards_legacy/xtensa => m5stack}/m5stack_stamps3/doc/img/m5stack_stamps3.webp (100%) rename boards/{boards_legacy/xtensa => m5stack}/m5stack_stamps3/doc/img/m5stack_stamps3_header.webp (100%) rename boards/{boards_legacy/xtensa => m5stack}/m5stack_stamps3/doc/index.rst (99%) rename boards/{boards_legacy/xtensa => m5stack}/m5stack_stamps3/m5stack_stamps3-pinctrl.dtsi (100%) rename boards/{boards_legacy/xtensa => m5stack}/m5stack_stamps3/m5stack_stamps3_connectors.dtsi (100%) create mode 100644 boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.dts create mode 100644 boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.yaml create mode 100644 boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu_defconfig rename boards/{boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.dts => m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.dts} (98%) rename boards/{boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.yaml => m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.yaml} (83%) rename boards/{boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3_defconfig => m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu_defconfig} (74%) diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.defconfig b/boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.defconfig deleted file mode 100644 index f451db3e231..00000000000 --- a/boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.defconfig +++ /dev/null @@ -1,27 +0,0 @@ -# M5Stack StampS3 board configuration -# Copyright (c) 2023 Martin Kiepfer -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_M5STACK_STAMPS3 - -config BOARD - default "m5stack_stamps3" - depends on BOARD_M5STACK_STAMPS3 - -config ENTROPY_GENERATOR - default y - -config HEAP_MEM_POOL_ADD_SIZE_BOARD - int - default 98304 if WIFI - default 65536 if BT - default 4096 - -config KERNEL_MEM_POOL - default y - -choice BT_HCI_BUS_TYPE - default BT_ESP32 if BT -endchoice - -endif # BOARD_M5STACK_STAMPS3 diff --git a/boards/m5stack/m5stack_stamps3/Kconfig b/boards/m5stack/m5stack_stamps3/Kconfig new file mode 100644 index 00000000000..3bc66a42ed4 --- /dev/null +++ b/boards/m5stack/m5stack_stamps3/Kconfig @@ -0,0 +1,6 @@ +# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_M5STACK_STAMPS3 + select SOC_ESP32S3_PROCPU if BOARD_M5STACK_STAMPS3_ESP32S3_PROCPU + select SOC_ESP32S3_APPCPU if BOARD_M5STACK_STAMPS3_ESP32S3_APPCPU diff --git a/boards/m5stack/m5stack_stamps3/Kconfig.defconfig b/boards/m5stack/m5stack_stamps3/Kconfig.defconfig new file mode 100644 index 00000000000..70493b8d475 --- /dev/null +++ b/boards/m5stack/m5stack_stamps3/Kconfig.defconfig @@ -0,0 +1,28 @@ +# M5Stack StampS3 board configuration +# Copyright (c) 2023 Martin Kiepfer +# SPDX-License-Identifier: Apache-2.0 + +if BOARD_M5STACK_STAMPS3_ESP32S3_PROCPU + +config HEAP_MEM_POOL_ADD_SIZE_BOARD + int + default 65535 if WIFI && BT + default 51200 if WIFI + default 40960 if BT + default 4096 + +config KERNEL_MEM_POOL + default y + +choice BT_HCI_BUS_TYPE + default BT_ESP32 if BT +endchoice + +endif # BOARD_M5STACK_STAMPS3_ESP32S3_PROCPU + +if BOARD_M5STACK_STAMPS3_ESP32S3_APPCPU + +config HEAP_MEM_POOL_ADD_SIZE_BOARD + default 256 + +endif # BOARD_M5STACK_STAMPS3_ESP32S3_APPCPU diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.board b/boards/m5stack/m5stack_stamps3/Kconfig.m5stack_stamps3 similarity index 56% rename from boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.board rename to boards/m5stack/m5stack_stamps3/Kconfig.m5stack_stamps3 index 1f22500830e..a48130faf89 100644 --- a/boards/boards_legacy/xtensa/m5stack_stamps3/Kconfig.board +++ b/boards/m5stack/m5stack_stamps3/Kconfig.m5stack_stamps3 @@ -4,9 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_M5STACK_STAMPS3 - bool "M5Stack StampS3 Development Board" - depends on SOC_SERIES_ESP32S3 - -choice SOC_PART_NUMBER - default SOC_ESP32S3_FN8 -endchoice + select SOC_ESP32S3_FN8 diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/board.cmake b/boards/m5stack/m5stack_stamps3/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/m5stack_stamps3/board.cmake rename to boards/m5stack/m5stack_stamps3/board.cmake diff --git a/boards/m5stack/m5stack_stamps3/board.yml b/boards/m5stack/m5stack_stamps3/board.yml new file mode 100644 index 00000000000..e723d91c19a --- /dev/null +++ b/boards/m5stack/m5stack_stamps3/board.yml @@ -0,0 +1,5 @@ +board: + name: m5stack_stamps3 + vendor: m5stack + socs: + - name: esp32s3 diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/doc/img/m5stack_stamps3.webp b/boards/m5stack/m5stack_stamps3/doc/img/m5stack_stamps3.webp similarity index 100% rename from boards/boards_legacy/xtensa/m5stack_stamps3/doc/img/m5stack_stamps3.webp rename to boards/m5stack/m5stack_stamps3/doc/img/m5stack_stamps3.webp diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/doc/img/m5stack_stamps3_header.webp b/boards/m5stack/m5stack_stamps3/doc/img/m5stack_stamps3_header.webp similarity index 100% rename from boards/boards_legacy/xtensa/m5stack_stamps3/doc/img/m5stack_stamps3_header.webp rename to boards/m5stack/m5stack_stamps3/doc/img/m5stack_stamps3_header.webp diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/doc/index.rst b/boards/m5stack/m5stack_stamps3/doc/index.rst similarity index 99% rename from boards/boards_legacy/xtensa/m5stack_stamps3/doc/index.rst rename to boards/m5stack/m5stack_stamps3/doc/index.rst index 75c660de803..59e1d5145aa 100644 --- a/boards/boards_legacy/xtensa/m5stack_stamps3/doc/index.rst +++ b/boards/m5stack/m5stack_stamps3/doc/index.rst @@ -149,7 +149,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: m5stack_stamps3 + :board: m5stack_stamps3/esp32s3/procpu :goals: build The usual ``flash`` target will work with the ``m5stack_stamps3`` board @@ -158,7 +158,7 @@ application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: m5stack_stamps3 + :board: m5stack_stamps3/esp32s3/procpu :goals: flash The baud rate of 921600bps is set by default. If experiencing issues when flashing, diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3-pinctrl.dtsi b/boards/m5stack/m5stack_stamps3/m5stack_stamps3-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3-pinctrl.dtsi rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3-pinctrl.dtsi diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3_connectors.dtsi b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_connectors.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3_connectors.dtsi rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_connectors.dtsi diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.dts b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.dts new file mode 100644 index 00000000000..a9e590b9bbf --- /dev/null +++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_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 = "M5Stack StampS3 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/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.yaml b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.yaml new file mode 100644 index 00000000000..eb4fcfcd028 --- /dev/null +++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu.yaml @@ -0,0 +1,27 @@ +identifier: m5stack_stamps3/esp32s3/appcpu +name: M5Stack StampS3 +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: m5stack diff --git a/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu_defconfig b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_appcpu_defconfig new file mode 100644 index 00000000000..100bb882567 --- /dev/null +++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_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/m5stack_stamps3/m5stack_stamps3.dts b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.dts similarity index 98% rename from boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.dts rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.dts index b4087e31bd9..f832f4618ba 100644 --- a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.dts +++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.dts @@ -14,7 +14,7 @@ #include / { - model = "M5Stack StampS3"; + model = "M5Stack StampS3 PROCPU"; compatible = "m5stack,stamps3"; chosen { diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.yaml b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.yaml similarity index 83% rename from boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.yaml rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.yaml index f5275cabe05..99e14f59b19 100644 --- a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3.yaml +++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu.yaml @@ -1,4 +1,4 @@ -identifier: m5stack_stamps3 +identifier: m5stack_stamps3/esp32s3/procpu name: M5Stack StampS3 type: mcu arch: xtensa diff --git a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3_defconfig b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu_defconfig similarity index 74% rename from boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3_defconfig rename to boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu_defconfig index 34f489623bc..466f9999601 100644 --- a/boards/boards_legacy/xtensa/m5stack_stamps3/m5stack_stamps3_defconfig +++ b/boards/m5stack/m5stack_stamps3/m5stack_stamps3_esp32s3_procpu_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_M5STACK_STAMPS3=y -CONFIG_SOC_SERIES_ESP32S3=y - CONFIG_MAIN_STACK_SIZE=2048 CONFIG_GPIO=y