From 7aa36e6640fbea54bf3983c3b690588fbfb55cb0 Mon Sep 17 00:00:00 2001 From: Sylvio Alves Date: Fri, 1 Mar 2024 08:13:32 -0300 Subject: [PATCH] boards: riscv: esp32c3_luatos_core: make usb variant Converts the board above to use variant option. Signed-off-by: Sylvio Alves --- .../Kconfig.esp32c3_luatos_core_usb | 5 ----- boards/luatos/esp32c3_luatos_core/board.yml | 16 +++++++--------- .../esp32c3_luatos_core/esp32c3_luatos_core.yaml | 2 +- ...b.dts => esp32c3_luatos_core_esp32c3_usb.dts} | 0 ...yaml => esp32c3_luatos_core_esp32c3_usb.yaml} | 2 +- ...=> esp32c3_luatos_core_esp32c3_usb_defconfig} | 0 6 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 boards/luatos/esp32c3_luatos_core/Kconfig.esp32c3_luatos_core_usb rename boards/luatos/esp32c3_luatos_core/{esp32c3_luatos_core_usb.dts => esp32c3_luatos_core_esp32c3_usb.dts} (100%) rename boards/luatos/esp32c3_luatos_core/{esp32c3_luatos_core_usb.yaml => esp32c3_luatos_core_esp32c3_usb.yaml} (84%) rename boards/luatos/esp32c3_luatos_core/{esp32c3_luatos_core_usb_defconfig => esp32c3_luatos_core_esp32c3_usb_defconfig} (100%) diff --git a/boards/luatos/esp32c3_luatos_core/Kconfig.esp32c3_luatos_core_usb b/boards/luatos/esp32c3_luatos_core/Kconfig.esp32c3_luatos_core_usb deleted file mode 100644 index f4d171a4435..00000000000 --- a/boards/luatos/esp32c3_luatos_core/Kconfig.esp32c3_luatos_core_usb +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2023 YuLong Yao -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_ESP32C3_LUATOS_CORE_USB - select SOC_ESP32C3_MINI_N4 diff --git a/boards/luatos/esp32c3_luatos_core/board.yml b/boards/luatos/esp32c3_luatos_core/board.yml index 9ec8420cfb9..e1a5ed42046 100644 --- a/boards/luatos/esp32c3_luatos_core/board.yml +++ b/boards/luatos/esp32c3_luatos_core/board.yml @@ -1,9 +1,7 @@ -boards: - - name: esp32c3_luatos_core - vendor: luatos - socs: - - name: esp32c3 - - name: esp32c3_luatos_core_usb - vendor: luatos - socs: - - name: esp32c3 +board: + name: esp32c3_luatos_core + vendor: luatos + socs: + - name: esp32c3 + variants: + - name: usb diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.yaml b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.yaml index d94f4a1d0f3..5baefb918a2 100644 --- a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.yaml +++ b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core.yaml @@ -1,4 +1,4 @@ -identifier: esp32c3_luatos_core +identifier: esp32c3_luatos_core/esp32c3 name: ESP32C3 LuatOS Core type: mcu arch: riscv diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb.dts b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.dts similarity index 100% rename from boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb.dts rename to boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.dts diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb.yaml b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.yaml similarity index 84% rename from boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb.yaml rename to boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.yaml index 4e56e48b220..7910c6ac8ee 100644 --- a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb.yaml +++ b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb.yaml @@ -1,4 +1,4 @@ -identifier: esp32c3_luatos_core_usb +identifier: esp32c3_luatos_core/esp32c3/usb name: ESP32C3 LuatOS Core USB type: mcu arch: riscv diff --git a/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb_defconfig b/boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb_defconfig similarity index 100% rename from boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_usb_defconfig rename to boards/luatos/esp32c3_luatos_core/esp32c3_luatos_core_esp32c3_usb_defconfig