diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.board b/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.board deleted file mode 100644 index 098f377092b..00000000000 --- a/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2023 Bartosz Bilas -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_KINCONY_KC868_A32 - bool "KINCONY KC868-A32 Board" - depends on SOC_SERIES_ESP32 - -choice SOC_PART_NUMBER - default SOC_ESP32_WROOM_32UE_N4 -endchoice diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.defconfig b/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.defconfig deleted file mode 100644 index 85e02264b5a..00000000000 --- a/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2023 Bartosz Bilas -# SPDX-License-Identifier: Apache-2.0 - -config BOARD - default "kincony_kc868_a32" - depends on BOARD_KINCONY_KC868_A32 - -config ENTROPY_GENERATOR - default y - -config HEAP_MEM_POOL_SIZE - default 65535 if WIFI && BT - default 51200 if WIFI - default 40960 if BT - default 4096 diff --git a/boards/kincony/index.rst b/boards/kincony/index.rst new file mode 100644 index 00000000000..afa86ed0895 --- /dev/null +++ b/boards/kincony/index.rst @@ -0,0 +1,10 @@ +.. _boards-kincony: + +Kincony +####### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/kincony/kincony_kc868_a32/Kconfig b/boards/kincony/kincony_kc868_a32/Kconfig new file mode 100644 index 00000000000..446d0a838bd --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/Kconfig @@ -0,0 +1,6 @@ +# Copyright (c) 2024 Espressif Systems (Shanghai) Co., Ltd. +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_KINCONY_KC868_A32 + select SOC_ESP32_PROCPU if BOARD_KINCONY_KC868_A32_ESP32_PROCPU + select SOC_ESP32_APPCPU if BOARD_KINCONY_KC868_A32_ESP32_APPCPU diff --git a/boards/kincony/kincony_kc868_a32/Kconfig.defconfig b/boards/kincony/kincony_kc868_a32/Kconfig.defconfig new file mode 100644 index 00000000000..e8705a11f98 --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/Kconfig.defconfig @@ -0,0 +1,24 @@ +# Copyright (c) 2023 Bartosz Bilas +# SPDX-License-Identifier: Apache-2.0 + +if BOARD_KINCONY_KC868_A32_ESP32_PROCPU + +config HEAP_MEM_POOL_ADD_SIZE_BOARD + int + default 65535 if WIFI && BT + default 51200 if WIFI + default 40960 if BT + default 4096 + +choice BT_HCI_BUS_TYPE + default BT_ESP32 if BT +endchoice + +endif # BOARD_KINCONY_KC868_A32_ESP32_PROCPU + +if BOARD_KINCONY_KC868_A32_ESP32_APPCPU + +config HEAP_MEM_POOL_ADD_SIZE_BOARD + default 256 + +endif # BOARD_KINCONY_KC868_A32_ESP32_APPCPU diff --git a/boards/kincony/kincony_kc868_a32/Kconfig.kincony_kc868_a32 b/boards/kincony/kincony_kc868_a32/Kconfig.kincony_kc868_a32 new file mode 100644 index 00000000000..ad38ee9ab76 --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/Kconfig.kincony_kc868_a32 @@ -0,0 +1,5 @@ +# Copyright (c) 2023 Bartosz Bilas +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_KINCONY_KC868_A32 + select SOC_ESP32_WROOM_32UE_N4 diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.sysbuild b/boards/kincony/kincony_kc868_a32/Kconfig.sysbuild similarity index 100% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/Kconfig.sysbuild rename to boards/kincony/kincony_kc868_a32/Kconfig.sysbuild diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/board.cmake b/boards/kincony/kincony_kc868_a32/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/board.cmake rename to boards/kincony/kincony_kc868_a32/board.cmake diff --git a/boards/kincony/kincony_kc868_a32/board.yml b/boards/kincony/kincony_kc868_a32/board.yml new file mode 100644 index 00000000000..99bf4fa715b --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/board.yml @@ -0,0 +1,5 @@ +board: + name: kincony_kc868_a32 + vendor: kincony + socs: + - name: esp32 diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/doc/img/kincony_kc868_a32.jpg b/boards/kincony/kincony_kc868_a32/doc/img/kincony_kc868_a32.jpg similarity index 100% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/doc/img/kincony_kc868_a32.jpg rename to boards/kincony/kincony_kc868_a32/doc/img/kincony_kc868_a32.jpg diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/doc/index.rst b/boards/kincony/kincony_kc868_a32/doc/index.rst similarity index 96% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/doc/index.rst rename to boards/kincony/kincony_kc868_a32/doc/index.rst index dfd4797701b..a6117bec55e 100644 --- a/boards/boards_legacy/xtensa/kincony_kc868_a32/doc/index.rst +++ b/boards/kincony/kincony_kc868_a32/doc/index.rst @@ -54,7 +54,7 @@ Build and flash applications as usual (see :ref:`build_an_application` and .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: kincony_kc868_a32 + :board: kincony_kc868_a32/esp32/procpu :goals: build The usual ``flash`` target will work with the ``kincony_kc868_a32`` board @@ -63,7 +63,7 @@ application. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: kincony_kc868_a32 + :board: kincony_kc868_a32/esp32/procpu :goals: flash Open the serial monitor using the following command: diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32-pinctrl.dtsi b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32-pinctrl.dtsi rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32-pinctrl.dtsi diff --git a/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.dts b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.dts new file mode 100644 index 00000000000..7940256ff29 --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_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 = "Kincony KC868_A32 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/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.yaml b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.yaml new file mode 100644 index 00000000000..af75ec0edbc --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu.yaml @@ -0,0 +1,27 @@ +identifier: kincony_kc868_a32/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/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu_defconfig b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_appcpu_defconfig new file mode 100644 index 00000000000..100bb882567 --- /dev/null +++ b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_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/kincony_kc868_a32/kincony_kc868_a32.dts b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.dts similarity index 98% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32.dts rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.dts index 2690ae75b24..0f459d7f7c5 100644 --- a/boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32.dts +++ b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.dts @@ -9,7 +9,7 @@ #include "kincony_kc868_a32-pinctrl.dtsi" / { - model = "Kincony KC868-A32"; + model = "Kincony KC868_A32 PROCPU"; compatible = "espressif,esp32"; aliases { diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32.yaml b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.yaml similarity index 83% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32.yaml rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.yaml index 72577b2572a..51ac12191f6 100644 --- a/boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32.yaml +++ b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu.yaml @@ -1,4 +1,4 @@ -identifier: kincony_kc868_a32 +identifier: kincony_kc868_a32/esp32/procpu name: KINCONY-KC868-A32 type: mcu arch: xtensa diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32_defconfig b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu_defconfig similarity index 75% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32_defconfig rename to boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu_defconfig index 7bb4a23e794..071024ac98d 100644 --- a/boards/boards_legacy/xtensa/kincony_kc868_a32/kincony_kc868_a32_defconfig +++ b/boards/kincony/kincony_kc868_a32/kincony_kc868_a32_esp32_procpu_defconfig @@ -1,9 +1,6 @@ # Copyright (c) Bartosz Bilas # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_KINCONY_KC868_A32=y -CONFIG_SOC_SERIES_ESP32=y - CONFIG_MAIN_STACK_SIZE=2048 CONFIG_CONSOLE=y diff --git a/boards/boards_legacy/xtensa/kincony_kc868_a32/support/openocd.cfg b/boards/kincony/kincony_kc868_a32/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/xtensa/kincony_kc868_a32/support/openocd.cfg rename to boards/kincony/kincony_kc868_a32/support/openocd.cfg