From c4b11e0251480f6441dc3251d165f5205cc5b70d Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Fri, 16 Feb 2024 09:56:39 +0100 Subject: [PATCH] boards: longan_nano: port to HWMv2 Port the board to HWMv2. Signed-off-by: Gerard Marull-Paretas --- .../riscv/longan_nano/Kconfig.board | 10 --------- .../riscv/longan_nano/Kconfig.defconfig | 14 ------------- .../longan_nano/longan_nano_lite_defconfig | 19 ------------------ boards/sipeed/index.rst | 10 +++++++++ boards/sipeed/longan_nano/Kconfig.defconfig | 10 +++++++++ boards/sipeed/longan_nano/Kconfig.longan_nano | 5 +++++ .../riscv => sipeed}/longan_nano/board.cmake | 0 boards/sipeed/longan_nano/board.yml | 7 +++++++ .../longan_nano/doc/img/longan_nano.jpg | Bin .../longan_nano/doc/index.rst | 0 .../longan_nano/longan_nano-common.dtsi | 0 .../longan_nano/longan_nano-pinctrl.dtsi | 0 .../longan_nano/longan_nano.dts | 0 .../longan_nano/longan_nano.yaml | 0 .../longan_nano/longan_nano_defconfig | 4 ---- .../longan_nano_gd32vf103_lite.dts} | 0 .../longan_nano_gd32vf103_lite.yaml} | 2 +- .../longan_nano/support/openocd.cfg | 0 samples/drivers/adc/sample.yaml | 2 +- samples/drivers/dac/README.rst | 2 +- samples/drivers/dac/sample.yaml | 2 +- tests/drivers/spi/spi_loopback/testcase.yaml | 4 ++-- tests/subsys/debug/coredump/src/main.c | 1 - 23 files changed, 38 insertions(+), 54 deletions(-) delete mode 100644 boards/boards_legacy/riscv/longan_nano/Kconfig.board delete mode 100644 boards/boards_legacy/riscv/longan_nano/Kconfig.defconfig delete mode 100644 boards/boards_legacy/riscv/longan_nano/longan_nano_lite_defconfig create mode 100644 boards/sipeed/index.rst create mode 100644 boards/sipeed/longan_nano/Kconfig.defconfig create mode 100644 boards/sipeed/longan_nano/Kconfig.longan_nano rename boards/{boards_legacy/riscv => sipeed}/longan_nano/board.cmake (100%) create mode 100644 boards/sipeed/longan_nano/board.yml rename boards/{boards_legacy/riscv => sipeed}/longan_nano/doc/img/longan_nano.jpg (100%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/doc/index.rst (100%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/longan_nano-common.dtsi (100%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/longan_nano-pinctrl.dtsi (100%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/longan_nano.dts (100%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/longan_nano.yaml (100%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/longan_nano_defconfig (78%) rename boards/{boards_legacy/riscv/longan_nano/longan_nano_lite.dts => sipeed/longan_nano/longan_nano_gd32vf103_lite.dts} (100%) rename boards/{boards_legacy/riscv/longan_nano/longan_nano_lite.yaml => sipeed/longan_nano/longan_nano_gd32vf103_lite.yaml} (80%) rename boards/{boards_legacy/riscv => sipeed}/longan_nano/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/riscv/longan_nano/Kconfig.board b/boards/boards_legacy/riscv/longan_nano/Kconfig.board deleted file mode 100644 index f656bdbf67a..00000000000 --- a/boards/boards_legacy/riscv/longan_nano/Kconfig.board +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2021 Tokita, Hiroshi -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_LONGAN_NANO - bool "Sipeed Longan Nano target" - depends on SOC_GD32VF103 - -config BOARD_LONGAN_NANO_LITE - bool "Sipeed Longan Nano Lite target" - depends on SOC_GD32VF103 diff --git a/boards/boards_legacy/riscv/longan_nano/Kconfig.defconfig b/boards/boards_legacy/riscv/longan_nano/Kconfig.defconfig deleted file mode 100644 index af4f75cf898..00000000000 --- a/boards/boards_legacy/riscv/longan_nano/Kconfig.defconfig +++ /dev/null @@ -1,14 +0,0 @@ -# Sipeed longan nano Development Board Configuration - -# Copyright (c) 2021 Tokita, Hiroshi - -if BOARD_LONGAN_NANO || BOARD_LONGAN_NANO_LITE - -config BOARD - default "longan_nano" if BOARD_LONGAN_NANO - default "longan_nano_lite" if BOARD_LONGAN_NANO_LITE - -config DISK_DRIVER_SDMMC - default y if DISK_DRIVERS - -endif # BOARD_LONGAN_NANO || BOARD_LONGAN_NANO_LITE diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano_lite_defconfig b/boards/boards_legacy/riscv/longan_nano/longan_nano_lite_defconfig deleted file mode 100644 index 2c3743c0162..00000000000 --- a/boards/boards_legacy/riscv/longan_nano/longan_nano_lite_defconfig +++ /dev/null @@ -1,19 +0,0 @@ -# Sipeed Longan Nano Lite board Configuration -# -# Copyright (c) 2021 Tokita, Hiroshi -# -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_SOC_SERIES_GD32VF103=y -CONFIG_SOC_GD32VF103=y -CONFIG_BOARD_LONGAN_NANO_LITE=y - -CONFIG_GD32_HXTAL_8MHZ=y - -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y - -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y - -CONFIG_GPIO=y diff --git a/boards/sipeed/index.rst b/boards/sipeed/index.rst new file mode 100644 index 00000000000..e84a42fc254 --- /dev/null +++ b/boards/sipeed/index.rst @@ -0,0 +1,10 @@ +.. _boards-sipeed: + +Sipeed +###### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/* diff --git a/boards/sipeed/longan_nano/Kconfig.defconfig b/boards/sipeed/longan_nano/Kconfig.defconfig new file mode 100644 index 00000000000..2eef2edbc2f --- /dev/null +++ b/boards/sipeed/longan_nano/Kconfig.defconfig @@ -0,0 +1,10 @@ +# Sipeed longan nano Development Board Configuration + +# Copyright (c) 2021 Tokita, Hiroshi + +if BOARD_LONGAN_NANO + +config DISK_DRIVER_SDMMC + default y if DISK_DRIVERS + +endif # BOARD_LONGAN_NANO diff --git a/boards/sipeed/longan_nano/Kconfig.longan_nano b/boards/sipeed/longan_nano/Kconfig.longan_nano new file mode 100644 index 00000000000..2ac5424d6b7 --- /dev/null +++ b/boards/sipeed/longan_nano/Kconfig.longan_nano @@ -0,0 +1,5 @@ +# Copyright (c) 2021 Tokita, Hiroshi +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_LONGAN_NANO + select SOC_GD32VF103 diff --git a/boards/boards_legacy/riscv/longan_nano/board.cmake b/boards/sipeed/longan_nano/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/board.cmake rename to boards/sipeed/longan_nano/board.cmake diff --git a/boards/sipeed/longan_nano/board.yml b/boards/sipeed/longan_nano/board.yml new file mode 100644 index 00000000000..20e83881aca --- /dev/null +++ b/boards/sipeed/longan_nano/board.yml @@ -0,0 +1,7 @@ +board: + name: longan_nano + vendor: Sipeed + socs: + - name: gd32vf103 + variants: + - name: lite diff --git a/boards/boards_legacy/riscv/longan_nano/doc/img/longan_nano.jpg b/boards/sipeed/longan_nano/doc/img/longan_nano.jpg similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/doc/img/longan_nano.jpg rename to boards/sipeed/longan_nano/doc/img/longan_nano.jpg diff --git a/boards/boards_legacy/riscv/longan_nano/doc/index.rst b/boards/sipeed/longan_nano/doc/index.rst similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/doc/index.rst rename to boards/sipeed/longan_nano/doc/index.rst diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano-common.dtsi b/boards/sipeed/longan_nano/longan_nano-common.dtsi similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/longan_nano-common.dtsi rename to boards/sipeed/longan_nano/longan_nano-common.dtsi diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano-pinctrl.dtsi b/boards/sipeed/longan_nano/longan_nano-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/longan_nano-pinctrl.dtsi rename to boards/sipeed/longan_nano/longan_nano-pinctrl.dtsi diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano.dts b/boards/sipeed/longan_nano/longan_nano.dts similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/longan_nano.dts rename to boards/sipeed/longan_nano/longan_nano.dts diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano.yaml b/boards/sipeed/longan_nano/longan_nano.yaml similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/longan_nano.yaml rename to boards/sipeed/longan_nano/longan_nano.yaml diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano_defconfig b/boards/sipeed/longan_nano/longan_nano_defconfig similarity index 78% rename from boards/boards_legacy/riscv/longan_nano/longan_nano_defconfig rename to boards/sipeed/longan_nano/longan_nano_defconfig index fc2aa06f616..353e533ef84 100644 --- a/boards/boards_legacy/riscv/longan_nano/longan_nano_defconfig +++ b/boards/sipeed/longan_nano/longan_nano_defconfig @@ -4,10 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_GD32VF103=y -CONFIG_SOC_GD32VF103=y -CONFIG_BOARD_LONGAN_NANO=y - CONFIG_GD32_HXTAL_8MHZ=y CONFIG_SERIAL=y diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano_lite.dts b/boards/sipeed/longan_nano/longan_nano_gd32vf103_lite.dts similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/longan_nano_lite.dts rename to boards/sipeed/longan_nano/longan_nano_gd32vf103_lite.dts diff --git a/boards/boards_legacy/riscv/longan_nano/longan_nano_lite.yaml b/boards/sipeed/longan_nano/longan_nano_gd32vf103_lite.yaml similarity index 80% rename from boards/boards_legacy/riscv/longan_nano/longan_nano_lite.yaml rename to boards/sipeed/longan_nano/longan_nano_gd32vf103_lite.yaml index 14f7e6fc938..27636b6d47e 100644 --- a/boards/boards_legacy/riscv/longan_nano/longan_nano_lite.yaml +++ b/boards/sipeed/longan_nano/longan_nano_gd32vf103_lite.yaml @@ -1,4 +1,4 @@ -identifier: longan_nano_lite +identifier: longan_nano/gd32vf103/lite name: Sipeed Longan Nano Lite type: mcu arch: riscv diff --git a/boards/boards_legacy/riscv/longan_nano/support/openocd.cfg b/boards/sipeed/longan_nano/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/riscv/longan_nano/support/openocd.cfg rename to boards/sipeed/longan_nano/support/openocd.cfg diff --git a/samples/drivers/adc/sample.yaml b/samples/drivers/adc/sample.yaml index 9ced96d6f56..dc0d76fcb00 100644 --- a/samples/drivers/adc/sample.yaml +++ b/samples/drivers/adc/sample.yaml @@ -28,7 +28,7 @@ tests: - lpcxpresso55s36 - mr_canhubk3 - longan_nano - - longan_nano_lite + - longan_nano/gd32vf103/lite integration_platforms: - nucleo_l073rz - nrf52840dk/nrf52840 diff --git a/samples/drivers/dac/README.rst b/samples/drivers/dac/README.rst index f7fe9b83723..a9983494389 100644 --- a/samples/drivers/dac/README.rst +++ b/samples/drivers/dac/README.rst @@ -206,7 +206,7 @@ also can run for the .. zephyr-app-commands:: :zephyr-app: samples/drivers/dac - :board: longan_nano_lite + :board: longan_nano/gd32vf103/lite :goals: build flash :compact: diff --git a/samples/drivers/dac/sample.yaml b/samples/drivers/dac/sample.yaml index 02db2c2fbe5..fa7dea45c31 100644 --- a/samples/drivers/dac/sample.yaml +++ b/samples/drivers/dac/sample.yaml @@ -19,8 +19,8 @@ tests: - gd32a503v_eval - gd32e103v_eval - gd32f450i_eval - - longan_nano_lite - longan_nano + - longan_nano/gd32vf103/lite - nucleo_f091rc - nucleo_f207zg - nucleo_f429zi diff --git a/tests/drivers/spi/spi_loopback/testcase.yaml b/tests/drivers/spi/spi_loopback/testcase.yaml index fef5e5b361d..ee952a1b053 100644 --- a/tests/drivers/spi/spi_loopback/testcase.yaml +++ b/tests/drivers/spi/spi_loopback/testcase.yaml @@ -113,7 +113,7 @@ tests: - gd32vf103c_starter - gd32vf103v_eval - longan_nano - - longan_nano_lite + - longan_nano/gd32vf103/lite drivers.spi.gd32_spi_dma.loopback: extra_args: OVERLAY_CONFIG="overlay-gd32-spi-dma.conf" platform_allow: @@ -126,7 +126,7 @@ tests: - gd32vf103c_starter - gd32vf103v_eval - longan_nano - - longan_nano_lite + - longan_nano/gd32vf103/lite drivers.spi.pl022_spi_interrupt.loopback: extra_configs: - CONFIG_SPI_PL022_INTERRUPT=y diff --git a/tests/subsys/debug/coredump/src/main.c b/tests/subsys/debug/coredump/src/main.c index d5e11f2148d..3f18ef9e2d6 100644 --- a/tests/subsys/debug/coredump/src/main.c +++ b/tests/subsys/debug/coredump/src/main.c @@ -30,7 +30,6 @@ void func_3(uint32_t *addr) #if defined(CONFIG_BOARD_M2GL025_MIV) || \ defined(CONFIG_BOARD_HIFIVE1) || \ defined(CONFIG_BOARD_LONGAN_NANO) || \ - defined(CONFIG_BOARD_LONGAN_NANO_LITE) || \ defined(CONFIG_BOARD_QEMU_XTENSA) || \ defined(CONFIG_SOC_FAMILY_INTEL_ADSP) ARG_UNUSED(addr);