diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/Kconfig.board b/boards/boards_legacy/riscv/qemu_riscv32e/Kconfig.board deleted file mode 100644 index ace6a7322dd..00000000000 --- a/boards/boards_legacy/riscv/qemu_riscv32e/Kconfig.board +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2022 Carlo Caione -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_QEMU_RISCV32E - bool "QEMU RISCV32E target" - depends on SOC_RISCV_VIRT - select QEMU_TARGET - select HAS_COVERAGE_SUPPORT - select RISCV_ISA_RV32E - select RISCV_ISA_EXT_ZICSR - select RISCV_ISA_EXT_ZIFENCEI diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/Kconfig.defconfig b/boards/boards_legacy/riscv/qemu_riscv32e/Kconfig.defconfig deleted file mode 100644 index 54d455ef540..00000000000 --- a/boards/boards_legacy/riscv/qemu_riscv32e/Kconfig.defconfig +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2022 Carlo Caione -# SPDX-License-Identifier: Apache-2.0 - -config BUILD_OUTPUT_BIN - default n - -config BOARD - default "qemu_riscv32e" if BOARD_QEMU_RISCV32E - -# Use thread local storage by default so that -# this feature gets more CI coverage. -config THREAD_LOCAL_STORAGE - default y diff --git a/boards/qemu/qemu_riscv32e/Kconfig b/boards/qemu/qemu_riscv32e/Kconfig new file mode 100644 index 00000000000..515c3d7287a --- /dev/null +++ b/boards/qemu/qemu_riscv32e/Kconfig @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV32E + select QEMU_TARGET diff --git a/boards/qemu/qemu_riscv32e/Kconfig.defconfig b/boards/qemu/qemu_riscv32e/Kconfig.defconfig new file mode 100644 index 00000000000..c3424c8722a --- /dev/null +++ b/boards/qemu/qemu_riscv32e/Kconfig.defconfig @@ -0,0 +1,16 @@ +# Copyright (c) 2024 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +if BOARD_QEMU_RISCV32E + +# Use thread local storage by default so that this feature gets more CI coverage. +config THREAD_LOCAL_STORAGE + default y + +config BUILD_OUTPUT_BIN + default n + +config HAS_COVERAGE_SUPPORT + default y + +endif # BOARD_QEMU_RISCV32E diff --git a/boards/qemu/qemu_riscv32e/Kconfig.qemu_riscv32e b/boards/qemu/qemu_riscv32e/Kconfig.qemu_riscv32e new file mode 100644 index 00000000000..f1256088e61 --- /dev/null +++ b/boards/qemu/qemu_riscv32e/Kconfig.qemu_riscv32e @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_QEMU_RISCV32E + select SOC_QEMU_VIRT_RISCV32E diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/board.cmake b/boards/qemu/qemu_riscv32e/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/qemu_riscv32e/board.cmake rename to boards/qemu/qemu_riscv32e/board.cmake diff --git a/boards/qemu/qemu_riscv32e/board.yml b/boards/qemu/qemu_riscv32e/board.yml new file mode 100644 index 00000000000..cc8e6f0becc --- /dev/null +++ b/boards/qemu/qemu_riscv32e/board.yml @@ -0,0 +1,5 @@ +board: + name: qemu_riscv32e + vendor: qemu + socs: + - name: qemu_virt_riscv32e diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/doc/index.rst b/boards/qemu/qemu_riscv32e/doc/index.rst similarity index 100% rename from boards/boards_legacy/riscv/qemu_riscv32e/doc/index.rst rename to boards/qemu/qemu_riscv32e/doc/index.rst diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e.dts b/boards/qemu/qemu_riscv32e/qemu_riscv32e.dts similarity index 100% rename from boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e.dts rename to boards/qemu/qemu_riscv32e/qemu_riscv32e.dts diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e.yaml b/boards/qemu/qemu_riscv32e/qemu_riscv32e.yaml similarity index 100% rename from boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e.yaml rename to boards/qemu/qemu_riscv32e/qemu_riscv32e.yaml diff --git a/boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e_defconfig b/boards/qemu/qemu_riscv32e/qemu_riscv32e_defconfig similarity index 76% rename from boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e_defconfig rename to boards/qemu/qemu_riscv32e/qemu_riscv32e_defconfig index 1f1c46acb10..affc1eeffb7 100644 --- a/boards/boards_legacy/riscv/qemu_riscv32e/qemu_riscv32e_defconfig +++ b/boards/qemu/qemu_riscv32e/qemu_riscv32e_defconfig @@ -1,7 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_RISCV_VIRT=y -CONFIG_BOARD_QEMU_RISCV32E=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y