From 0a96dcb7787f4727f997e3d6e123fe8caa58f51e Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 19 Feb 2024 13:46:49 +0000 Subject: [PATCH] boards: riscv: esp32c3_devkitm: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../riscv => espressif}/esp32c3_devkitm/Kconfig.defconfig | 4 ---- .../esp32c3_devkitm/Kconfig.esp32c3_devkitm} | 7 +------ .../riscv => espressif}/esp32c3_devkitm/Kconfig.sysbuild | 0 .../riscv => espressif}/esp32c3_devkitm/board.cmake | 0 boards/espressif/esp32c3_devkitm/board.yml | 5 +++++ .../riscv => espressif}/esp32c3_devkitm/doc/index.rst | 6 +++--- .../esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi | 0 .../esp32c3_devkitm/esp32c3_devkitm.dts | 2 +- .../esp32c3_devkitm/esp32c3_devkitm.yaml | 0 .../esp32c3_devkitm/esp32c3_devkitm_defconfig | 3 --- .../esp32c3_devkitm/support/openocd.cfg | 0 11 files changed, 10 insertions(+), 17 deletions(-) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/Kconfig.defconfig (81%) rename boards/{boards_legacy/riscv/esp32c3_devkitm/Kconfig.board => espressif/esp32c3_devkitm/Kconfig.esp32c3_devkitm} (57%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/Kconfig.sysbuild (100%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/board.cmake (100%) create mode 100644 boards/espressif/esp32c3_devkitm/board.yml rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/doc/index.rst (98%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi (100%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/esp32c3_devkitm.dts (98%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/esp32c3_devkitm.yaml (100%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/esp32c3_devkitm_defconfig (69%) rename boards/{boards_legacy/riscv => espressif}/esp32c3_devkitm/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.defconfig b/boards/espressif/esp32c3_devkitm/Kconfig.defconfig similarity index 81% rename from boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.defconfig rename to boards/espressif/esp32c3_devkitm/Kconfig.defconfig index 922368f923b..9944bb87195 100644 --- a/boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.defconfig +++ b/boards/espressif/esp32c3_devkitm/Kconfig.defconfig @@ -3,10 +3,6 @@ # Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd. # SPDX-License-Identifier: Apache-2.0 -config BOARD - default "esp32c3_devkitm" - depends on BOARD_ESP32C3_DEVKITM - config HEAP_MEM_POOL_ADD_SIZE_BOARD int default 65535 if WIFI && BT diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.board b/boards/espressif/esp32c3_devkitm/Kconfig.esp32c3_devkitm similarity index 57% rename from boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.board rename to boards/espressif/esp32c3_devkitm/Kconfig.esp32c3_devkitm index 51f0f3957df..854b9944ef4 100644 --- a/boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.board +++ b/boards/espressif/esp32c3_devkitm/Kconfig.esp32c3_devkitm @@ -4,9 +4,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_ESP32C3_DEVKITM - bool "ESP32C3 Devkit-M Board" - depends on SOC_SERIES_ESP32C3 - -choice SOC_PART_NUMBER - default SOC_ESP32C3_MINI_N4 -endchoice + select SOC_ESP32C3_MINI_N4 diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.sysbuild b/boards/espressif/esp32c3_devkitm/Kconfig.sysbuild similarity index 100% rename from boards/boards_legacy/riscv/esp32c3_devkitm/Kconfig.sysbuild rename to boards/espressif/esp32c3_devkitm/Kconfig.sysbuild diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/board.cmake b/boards/espressif/esp32c3_devkitm/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/esp32c3_devkitm/board.cmake rename to boards/espressif/esp32c3_devkitm/board.cmake diff --git a/boards/espressif/esp32c3_devkitm/board.yml b/boards/espressif/esp32c3_devkitm/board.yml new file mode 100644 index 00000000000..649dce34a7d --- /dev/null +++ b/boards/espressif/esp32c3_devkitm/board.yml @@ -0,0 +1,5 @@ +board: + name: esp32c3_devkitm + vendor: espressif + socs: + - name: esp32c3 diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/doc/index.rst b/boards/espressif/esp32c3_devkitm/doc/index.rst similarity index 98% rename from boards/boards_legacy/riscv/esp32c3_devkitm/doc/index.rst rename to boards/espressif/esp32c3_devkitm/doc/index.rst index 26f1521e087..379d2c31065 100644 --- a/boards/boards_legacy/riscv/esp32c3_devkitm/doc/index.rst +++ b/boards/espressif/esp32c3_devkitm/doc/index.rst @@ -144,9 +144,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/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi rename to boards/espressif/esp32c3_devkitm/esp32c3_devkitm-pinctrl.dtsi diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm.dts b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts similarity index 98% rename from boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm.dts rename to boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts index 6c390956e48..e636089ba03 100644 --- a/boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm.dts +++ b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts @@ -11,7 +11,7 @@ #include / { - model = "esp32c3_devkitm"; + model = "Espressif ESP32-DevkitM"; compatible = "espressif,esp32c3"; chosen { diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm.yaml b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.yaml similarity index 100% rename from boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm.yaml rename to boards/espressif/esp32c3_devkitm/esp32c3_devkitm.yaml diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm_defconfig similarity index 69% rename from boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig rename to boards/espressif/esp32c3_devkitm/esp32c3_devkitm_defconfig index 1ca521d9d95..ef633ce56a1 100644 --- a/boards/boards_legacy/riscv/esp32c3_devkitm/esp32c3_devkitm_defconfig +++ b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm_defconfig @@ -1,8 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_BOARD_ESP32C3_DEVKITM=y -CONFIG_SOC_SERIES_ESP32C3=y - CONFIG_MAIN_STACK_SIZE=2048 CONFIG_CONSOLE=y diff --git a/boards/boards_legacy/riscv/esp32c3_devkitm/support/openocd.cfg b/boards/espressif/esp32c3_devkitm/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/riscv/esp32c3_devkitm/support/openocd.cfg rename to boards/espressif/esp32c3_devkitm/support/openocd.cfg