From e23a41200d4d5604a85cb236f003daa95614c3c2 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 19 Feb 2024 13:48:18 +0000 Subject: [PATCH] boards: riscv: icev_wireless: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../icev_wireless/Kconfig.defconfig | 4 ---- .../icev_wireless/Kconfig.icev_wireless} | 3 +-- .../riscv => others}/icev_wireless/Kconfig.sysbuild | 0 .../riscv => others}/icev_wireless/board.cmake | 0 boards/others/icev_wireless/board.yml | 5 +++++ .../icev_wireless/doc/img/icev_wireless.jpg | Bin .../icev_wireless/doc/img/icev_wireless_back.jpg | Bin .../icev_wireless/doc/img/icev_wireless_pinout.jpg | Bin .../riscv => others}/icev_wireless/doc/index.rst | 6 +++--- .../icev_wireless/icev_wireless-pinctrl.dtsi | 0 .../icev_wireless/icev_wireless.dts | 2 +- .../icev_wireless/icev_wireless.yaml | 0 .../icev_wireless/icev_wireless_defconfig | 3 --- .../icev_wireless/support/openocd.cfg | 0 14 files changed, 10 insertions(+), 13 deletions(-) rename boards/{boards_legacy/riscv => others}/icev_wireless/Kconfig.defconfig (80%) rename boards/{boards_legacy/riscv/icev_wireless/Kconfig.board => others/icev_wireless/Kconfig.icev_wireless} (71%) rename boards/{boards_legacy/riscv => others}/icev_wireless/Kconfig.sysbuild (100%) rename boards/{boards_legacy/riscv => others}/icev_wireless/board.cmake (100%) create mode 100644 boards/others/icev_wireless/board.yml rename boards/{boards_legacy/riscv => others}/icev_wireless/doc/img/icev_wireless.jpg (100%) rename boards/{boards_legacy/riscv => others}/icev_wireless/doc/img/icev_wireless_back.jpg (100%) rename boards/{boards_legacy/riscv => others}/icev_wireless/doc/img/icev_wireless_pinout.jpg (100%) rename boards/{boards_legacy/riscv => others}/icev_wireless/doc/index.rst (98%) rename boards/{boards_legacy/riscv => others}/icev_wireless/icev_wireless-pinctrl.dtsi (100%) rename boards/{boards_legacy/riscv => others}/icev_wireless/icev_wireless.dts (98%) rename boards/{boards_legacy/riscv => others}/icev_wireless/icev_wireless.yaml (100%) rename boards/{boards_legacy/riscv => others}/icev_wireless/icev_wireless_defconfig (70%) rename boards/{boards_legacy/riscv => others}/icev_wireless/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/riscv/icev_wireless/Kconfig.defconfig b/boards/others/icev_wireless/Kconfig.defconfig similarity index 80% rename from boards/boards_legacy/riscv/icev_wireless/Kconfig.defconfig rename to boards/others/icev_wireless/Kconfig.defconfig index 44157fd5b6a..96ed16249d4 100644 --- a/boards/boards_legacy/riscv/icev_wireless/Kconfig.defconfig +++ b/boards/others/icev_wireless/Kconfig.defconfig @@ -1,10 +1,6 @@ # Copyright (c) 2022 Friedt Professional Engineering Services, Inc # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "icev_wireless" - depends on BOARD_ICEV_WIRELESS - config HEAP_MEM_POOL_ADD_SIZE_BOARD int default 65535 if WIFI && BT diff --git a/boards/boards_legacy/riscv/icev_wireless/Kconfig.board b/boards/others/icev_wireless/Kconfig.icev_wireless similarity index 71% rename from boards/boards_legacy/riscv/icev_wireless/Kconfig.board rename to boards/others/icev_wireless/Kconfig.icev_wireless index 21e7a72815e..22ef32910e5 100644 --- a/boards/boards_legacy/riscv/icev_wireless/Kconfig.board +++ b/boards/others/icev_wireless/Kconfig.icev_wireless @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_ICEV_WIRELESS - bool "ICE-V Wireless Board" - depends on SOC_ESP32C3 + select SOC_ESP32C3_MINI_N4 diff --git a/boards/boards_legacy/riscv/icev_wireless/Kconfig.sysbuild b/boards/others/icev_wireless/Kconfig.sysbuild similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/Kconfig.sysbuild rename to boards/others/icev_wireless/Kconfig.sysbuild diff --git a/boards/boards_legacy/riscv/icev_wireless/board.cmake b/boards/others/icev_wireless/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/board.cmake rename to boards/others/icev_wireless/board.cmake diff --git a/boards/others/icev_wireless/board.yml b/boards/others/icev_wireless/board.yml new file mode 100644 index 00000000000..2dcef96cbdf --- /dev/null +++ b/boards/others/icev_wireless/board.yml @@ -0,0 +1,5 @@ +board: + name: icev_wireless + vendor: others + socs: + - name: esp32c3 diff --git a/boards/boards_legacy/riscv/icev_wireless/doc/img/icev_wireless.jpg b/boards/others/icev_wireless/doc/img/icev_wireless.jpg similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/doc/img/icev_wireless.jpg rename to boards/others/icev_wireless/doc/img/icev_wireless.jpg diff --git a/boards/boards_legacy/riscv/icev_wireless/doc/img/icev_wireless_back.jpg b/boards/others/icev_wireless/doc/img/icev_wireless_back.jpg similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/doc/img/icev_wireless_back.jpg rename to boards/others/icev_wireless/doc/img/icev_wireless_back.jpg diff --git a/boards/boards_legacy/riscv/icev_wireless/doc/img/icev_wireless_pinout.jpg b/boards/others/icev_wireless/doc/img/icev_wireless_pinout.jpg similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/doc/img/icev_wireless_pinout.jpg rename to boards/others/icev_wireless/doc/img/icev_wireless_pinout.jpg diff --git a/boards/boards_legacy/riscv/icev_wireless/doc/index.rst b/boards/others/icev_wireless/doc/index.rst similarity index 98% rename from boards/boards_legacy/riscv/icev_wireless/doc/index.rst rename to boards/others/icev_wireless/doc/index.rst index a3ae804c668..a931bb33da7 100644 --- a/boards/boards_legacy/riscv/icev_wireless/doc/index.rst +++ b/boards/others/icev_wireless/doc/index.rst @@ -150,9 +150,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 diff --git a/boards/boards_legacy/riscv/icev_wireless/icev_wireless-pinctrl.dtsi b/boards/others/icev_wireless/icev_wireless-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/icev_wireless-pinctrl.dtsi rename to boards/others/icev_wireless/icev_wireless-pinctrl.dtsi diff --git a/boards/boards_legacy/riscv/icev_wireless/icev_wireless.dts b/boards/others/icev_wireless/icev_wireless.dts similarity index 98% rename from boards/boards_legacy/riscv/icev_wireless/icev_wireless.dts rename to boards/others/icev_wireless/icev_wireless.dts index 1e5719fe2aa..8ed474200e0 100644 --- a/boards/boards_legacy/riscv/icev_wireless/icev_wireless.dts +++ b/boards/others/icev_wireless/icev_wireless.dts @@ -11,7 +11,7 @@ #include / { - model = "icev_wireless"; + model = "ICEV Wireless"; compatible = "espressif,esp32c3"; chosen { diff --git a/boards/boards_legacy/riscv/icev_wireless/icev_wireless.yaml b/boards/others/icev_wireless/icev_wireless.yaml similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/icev_wireless.yaml rename to boards/others/icev_wireless/icev_wireless.yaml diff --git a/boards/boards_legacy/riscv/icev_wireless/icev_wireless_defconfig b/boards/others/icev_wireless/icev_wireless_defconfig similarity index 70% rename from boards/boards_legacy/riscv/icev_wireless/icev_wireless_defconfig rename to boards/others/icev_wireless/icev_wireless_defconfig index c5be5732a71..ef633ce56a1 100644 --- a/boards/boards_legacy/riscv/icev_wireless/icev_wireless_defconfig +++ b/boards/others/icev_wireless/icev_wireless_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_ICEV_WIRELESS=y -CONFIG_SOC_SERIES_ESP32C3=y - CONFIG_MAIN_STACK_SIZE=2048 CONFIG_CONSOLE=y diff --git a/boards/boards_legacy/riscv/icev_wireless/support/openocd.cfg b/boards/others/icev_wireless/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/riscv/icev_wireless/support/openocd.cfg rename to boards/others/icev_wireless/support/openocd.cfg