From 706e5d27cd3933254f02c7935909afb935e3f9f5 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 19 Feb 2024 08:48:01 +0000 Subject: [PATCH] boards: riscv: neorv32: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- boards/boards_legacy/riscv/neorv32/Kconfig.defconfig | 9 --------- boards/boards_legacy/riscv/neorv32/revision.cmake | 7 ------- .../riscv => others}/neorv32/CMakeLists.txt | 0 .../neorv32/Kconfig.board => others/neorv32/Kconfig} | 3 +-- .../neorv32/Kconfig.neorv32} | 3 ++- .../riscv => others}/neorv32/board.cmake | 0 boards/others/neorv32/board.yml | 10 ++++++++++ .../riscv => others}/neorv32/doc/index.rst | 0 .../riscv => others}/neorv32/neorv32.dts | 0 .../riscv => others}/neorv32/neorv32.yaml | 0 .../riscv => others}/neorv32/neorv32_defconfig | 2 -- .../riscv => others}/neorv32/support/neorv32.cfg | 0 .../riscv => others}/neorv32/support/openocd.cfg | 0 13 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 boards/boards_legacy/riscv/neorv32/Kconfig.defconfig delete mode 100644 boards/boards_legacy/riscv/neorv32/revision.cmake rename boards/{boards_legacy/riscv => others}/neorv32/CMakeLists.txt (100%) rename boards/{boards_legacy/riscv/neorv32/Kconfig.board => others/neorv32/Kconfig} (67%) rename boards/{boards_legacy/riscv/neorv32/neorv32_1_8_6.conf => others/neorv32/Kconfig.neorv32} (72%) rename boards/{boards_legacy/riscv => others}/neorv32/board.cmake (100%) create mode 100644 boards/others/neorv32/board.yml rename boards/{boards_legacy/riscv => others}/neorv32/doc/index.rst (100%) rename boards/{boards_legacy/riscv => others}/neorv32/neorv32.dts (100%) rename boards/{boards_legacy/riscv => others}/neorv32/neorv32.yaml (100%) rename boards/{boards_legacy/riscv => others}/neorv32/neorv32_defconfig (84%) rename boards/{boards_legacy/riscv => others}/neorv32/support/neorv32.cfg (100%) rename boards/{boards_legacy/riscv => others}/neorv32/support/openocd.cfg (100%) diff --git a/boards/boards_legacy/riscv/neorv32/Kconfig.defconfig b/boards/boards_legacy/riscv/neorv32/Kconfig.defconfig deleted file mode 100644 index 350255fb06a..00000000000 --- a/boards/boards_legacy/riscv/neorv32/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2021 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NEORV32 - -config BOARD - default "neorv32" - -endif # BOARD_NEORV32 diff --git a/boards/boards_legacy/riscv/neorv32/revision.cmake b/boards/boards_legacy/riscv/neorv32/revision.cmake deleted file mode 100644 index b09cf369611..00000000000 --- a/boards/boards_legacy/riscv/neorv32/revision.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 Henrik Brix Andersen -# SPDX-License-Identifier: Apache-2.0 - -board_check_revision( - FORMAT MAJOR.MINOR.PATCH - DEFAULT_REVISION 1.8.6 -) diff --git a/boards/boards_legacy/riscv/neorv32/CMakeLists.txt b/boards/others/neorv32/CMakeLists.txt similarity index 100% rename from boards/boards_legacy/riscv/neorv32/CMakeLists.txt rename to boards/others/neorv32/CMakeLists.txt diff --git a/boards/boards_legacy/riscv/neorv32/Kconfig.board b/boards/others/neorv32/Kconfig similarity index 67% rename from boards/boards_legacy/riscv/neorv32/Kconfig.board rename to boards/others/neorv32/Kconfig index 6d85ebb2e40..57e0edc10d6 100644 --- a/boards/boards_legacy/riscv/neorv32/Kconfig.board +++ b/boards/others/neorv32/Kconfig @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_NEORV32 - bool "NEORV32 Processor (SoC)" - depends on SOC_NEORV32 + select SOC_NEORV32_V1_8_6 if "$(BOARD_REVISION)" = "1.8.6" diff --git a/boards/boards_legacy/riscv/neorv32/neorv32_1_8_6.conf b/boards/others/neorv32/Kconfig.neorv32 similarity index 72% rename from boards/boards_legacy/riscv/neorv32/neorv32_1_8_6.conf rename to boards/others/neorv32/Kconfig.neorv32 index b1852631eeb..1e5efecd08f 100644 --- a/boards/boards_legacy/riscv/neorv32/neorv32_1_8_6.conf +++ b/boards/others/neorv32/Kconfig.neorv32 @@ -1,4 +1,5 @@ # Copyright (c) 2021 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NEORV32_V1_8_6=y +config BOARD_NEORV32 + select SOC_NEORV32 diff --git a/boards/boards_legacy/riscv/neorv32/board.cmake b/boards/others/neorv32/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/neorv32/board.cmake rename to boards/others/neorv32/board.cmake diff --git a/boards/others/neorv32/board.yml b/boards/others/neorv32/board.yml new file mode 100644 index 00000000000..f12fa42b78f --- /dev/null +++ b/boards/others/neorv32/board.yml @@ -0,0 +1,10 @@ +board: + name: neorv32 + vendor: others + revision: + format: major.minor.patch + default: "1.8.6" + revisions: + - name: "1.8.6" + socs: + - name: neorv32 diff --git a/boards/boards_legacy/riscv/neorv32/doc/index.rst b/boards/others/neorv32/doc/index.rst similarity index 100% rename from boards/boards_legacy/riscv/neorv32/doc/index.rst rename to boards/others/neorv32/doc/index.rst diff --git a/boards/boards_legacy/riscv/neorv32/neorv32.dts b/boards/others/neorv32/neorv32.dts similarity index 100% rename from boards/boards_legacy/riscv/neorv32/neorv32.dts rename to boards/others/neorv32/neorv32.dts diff --git a/boards/boards_legacy/riscv/neorv32/neorv32.yaml b/boards/others/neorv32/neorv32.yaml similarity index 100% rename from boards/boards_legacy/riscv/neorv32/neorv32.yaml rename to boards/others/neorv32/neorv32.yaml diff --git a/boards/boards_legacy/riscv/neorv32/neorv32_defconfig b/boards/others/neorv32/neorv32_defconfig similarity index 84% rename from boards/boards_legacy/riscv/neorv32/neorv32_defconfig rename to boards/others/neorv32/neorv32_defconfig index 7dc8a74ffff..2642d046b50 100644 --- a/boards/boards_legacy/riscv/neorv32/neorv32_defconfig +++ b/boards/others/neorv32/neorv32_defconfig @@ -1,9 +1,7 @@ # Copyright (c) 2021 Henrik Brix Andersen # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_NEORV32=y CONFIG_SOC_NEORV32_ISA_C=y -CONFIG_BOARD_NEORV32=y CONFIG_SERIAL=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/boards_legacy/riscv/neorv32/support/neorv32.cfg b/boards/others/neorv32/support/neorv32.cfg similarity index 100% rename from boards/boards_legacy/riscv/neorv32/support/neorv32.cfg rename to boards/others/neorv32/support/neorv32.cfg diff --git a/boards/boards_legacy/riscv/neorv32/support/openocd.cfg b/boards/others/neorv32/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/riscv/neorv32/support/openocd.cfg rename to boards/others/neorv32/support/openocd.cfg