diff --git a/boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched_defconfig b/boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched_defconfig deleted file mode 100644 index be13ed10358..00000000000 --- a/boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_SOC_SERIES_SIFIVE_FREEDOM_U700=y -CONFIG_SOC_SIFIVE_FREEDOM_U740=y -CONFIG_BOARD_HIFIVE_UNMATCHED=y -CONFIG_CONSOLE=y -CONFIG_SERIAL=y -CONFIG_UART_SIFIVE_PORT_0=y -CONFIG_UART_CONSOLE=y -CONFIG_XIP=n diff --git a/boards/boards_legacy/riscv/hifive_unmatched/Kconfig.defconfig b/boards/sifive/hifive_unmatched/Kconfig.defconfig similarity index 80% rename from boards/boards_legacy/riscv/hifive_unmatched/Kconfig.defconfig rename to boards/sifive/hifive_unmatched/Kconfig.defconfig index ee38da1c579..3ced33713cb 100644 --- a/boards/boards_legacy/riscv/hifive_unmatched/Kconfig.defconfig +++ b/boards/sifive/hifive_unmatched/Kconfig.defconfig @@ -3,13 +3,10 @@ if BOARD_HIFIVE_UNMATCHED -config BOARD - default "hifive_unmatched" - config SYS_CLOCK_TICKS_PER_SEC default 1000 config SYS_CLOCK_HW_CYCLES_PER_SEC default 1000000 -endif +endif # BOARD_HIFIVE_UNMATCHED diff --git a/boards/boards_legacy/riscv/hifive_unmatched/Kconfig.board b/boards/sifive/hifive_unmatched/Kconfig.hifive_unmatched similarity index 61% rename from boards/boards_legacy/riscv/hifive_unmatched/Kconfig.board rename to boards/sifive/hifive_unmatched/Kconfig.hifive_unmatched index bb303cc3aac..87911f3ccb3 100644 --- a/boards/boards_legacy/riscv/hifive_unmatched/Kconfig.board +++ b/boards/sifive/hifive_unmatched/Kconfig.hifive_unmatched @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_HIFIVE_UNMATCHED - bool "HiFive Unmatched target" - depends on SOC_SIFIVE_FREEDOM_U740 + select SOC_SIFIVE_FREEDOM_FU740 diff --git a/boards/boards_legacy/riscv/hifive_unmatched/board.cmake b/boards/sifive/hifive_unmatched/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/board.cmake rename to boards/sifive/hifive_unmatched/board.cmake diff --git a/boards/sifive/hifive_unmatched/board.yml b/boards/sifive/hifive_unmatched/board.yml new file mode 100644 index 00000000000..703d94e852b --- /dev/null +++ b/boards/sifive/hifive_unmatched/board.yml @@ -0,0 +1,5 @@ +board: + name: hifive_unmatched + vendor: sifive + socs: + - name: fu740 diff --git a/boards/boards_legacy/riscv/hifive_unmatched/doc/img/hifive_unmatched.jpg b/boards/sifive/hifive_unmatched/doc/img/hifive_unmatched.jpg similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/doc/img/hifive_unmatched.jpg rename to boards/sifive/hifive_unmatched/doc/img/hifive_unmatched.jpg diff --git a/boards/boards_legacy/riscv/hifive_unmatched/doc/index.rst b/boards/sifive/hifive_unmatched/doc/index.rst similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/doc/index.rst rename to boards/sifive/hifive_unmatched/doc/index.rst diff --git a/boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched.dts b/boards/sifive/hifive_unmatched/hifive_unmatched.dts similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched.dts rename to boards/sifive/hifive_unmatched/hifive_unmatched.dts diff --git a/boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched.yaml b/boards/sifive/hifive_unmatched/hifive_unmatched.yaml similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/hifive_unmatched.yaml rename to boards/sifive/hifive_unmatched/hifive_unmatched.yaml diff --git a/boards/sifive/hifive_unmatched/hifive_unmatched_defconfig b/boards/sifive/hifive_unmatched/hifive_unmatched_defconfig new file mode 100644 index 00000000000..02295cf19df --- /dev/null +++ b/boards/sifive/hifive_unmatched/hifive_unmatched_defconfig @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_CONSOLE=y +CONFIG_SERIAL=y +CONFIG_UART_SIFIVE_PORT_0=y +CONFIG_UART_CONSOLE=y +CONFIG_XIP=n diff --git a/boards/boards_legacy/riscv/hifive_unmatched/support/hifive_unmatched.resc b/boards/sifive/hifive_unmatched/support/hifive_unmatched.resc similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/support/hifive_unmatched.resc rename to boards/sifive/hifive_unmatched/support/hifive_unmatched.resc diff --git a/boards/boards_legacy/riscv/hifive_unmatched/support/openocd_hifive_unmatched.cfg b/boards/sifive/hifive_unmatched/support/openocd_hifive_unmatched.cfg similarity index 100% rename from boards/boards_legacy/riscv/hifive_unmatched/support/openocd_hifive_unmatched.cfg rename to boards/sifive/hifive_unmatched/support/openocd_hifive_unmatched.cfg