diff --git a/boards/boards_legacy/riscv/hifive1/Kconfig.board b/boards/boards_legacy/riscv/hifive1/Kconfig.board deleted file mode 100644 index d2f40472f24..00000000000 --- a/boards/boards_legacy/riscv/hifive1/Kconfig.board +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_HIFIVE1 - bool "HiFive1 target" - depends on SOC_SIFIVE_FREEDOM_E340 diff --git a/boards/boards_legacy/riscv/hifive1/Kconfig.defconfig b/boards/sifive/hifive1/Kconfig.defconfig similarity index 60% rename from boards/boards_legacy/riscv/hifive1/Kconfig.defconfig rename to boards/sifive/hifive1/Kconfig.defconfig index 33356cb4da7..e7eaa659929 100644 --- a/boards/boards_legacy/riscv/hifive1/Kconfig.defconfig +++ b/boards/sifive/hifive1/Kconfig.defconfig @@ -1,11 +1,8 @@ # SPDX-License-Identifier: Apache-2.0 -if BOARD_HIFIVE1 - -config BOARD - default "hifive1" +if BOARD_HIFIVE1_FE310 config SYS_CLOCK_TICKS_PER_SEC default 128 -endif +endif # BOARD_HIFIVE1_FE310 diff --git a/boards/sifive/hifive1/Kconfig.hifive1 b/boards/sifive/hifive1/Kconfig.hifive1 new file mode 100644 index 00000000000..29132f70288 --- /dev/null +++ b/boards/sifive/hifive1/Kconfig.hifive1 @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Antmicro +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_HIFIVE1 + select SOC_SIFIVE_FREEDOM_FE310 diff --git a/boards/boards_legacy/riscv/hifive1/board.cmake b/boards/sifive/hifive1/board.cmake similarity index 100% rename from boards/boards_legacy/riscv/hifive1/board.cmake rename to boards/sifive/hifive1/board.cmake diff --git a/boards/sifive/hifive1/board.yml b/boards/sifive/hifive1/board.yml new file mode 100644 index 00000000000..2909cb5aaeb --- /dev/null +++ b/boards/sifive/hifive1/board.yml @@ -0,0 +1,11 @@ +board: + name: hifive1 + vendor: sifive + socs: + - name: fe310 + revision: + format: letter + default: "A" + revisions: + - name: "A" + - name: "B" diff --git a/boards/boards_legacy/riscv/hifive1/doc/img/hifive1.jpg b/boards/sifive/hifive1/doc/img/hifive1.jpg similarity index 100% rename from boards/boards_legacy/riscv/hifive1/doc/img/hifive1.jpg rename to boards/sifive/hifive1/doc/img/hifive1.jpg diff --git a/boards/boards_legacy/riscv/hifive1/doc/index.rst b/boards/sifive/hifive1/doc/index.rst similarity index 95% rename from boards/boards_legacy/riscv/hifive1/doc/index.rst rename to boards/sifive/hifive1/doc/index.rst index 9482a6ad0d4..1f7f7e9bad0 100644 --- a/boards/boards_legacy/riscv/hifive1/doc/index.rst +++ b/boards/sifive/hifive1/doc/index.rst @@ -11,10 +11,12 @@ an FE310 RISC-V SoC. More information can be found on `SiFive's website `_. -.. image:: img/hifive1.jpg +.. figure:: img/hifive1.jpg :align: center :alt: SiFive HiFive1 board + SiFive HiFive1 board (image courtesy of SiFive) + Programming and debugging ************************* diff --git a/boards/boards_legacy/riscv/hifive1/hifive1-pinctrl.dtsi b/boards/sifive/hifive1/hifive1-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/riscv/hifive1/hifive1-pinctrl.dtsi rename to boards/sifive/hifive1/hifive1-pinctrl.dtsi diff --git a/boards/boards_legacy/riscv/hifive1/hifive1.dts b/boards/sifive/hifive1/hifive1.dts similarity index 100% rename from boards/boards_legacy/riscv/hifive1/hifive1.dts rename to boards/sifive/hifive1/hifive1.dts diff --git a/boards/boards_legacy/riscv/hifive1/hifive1.yaml b/boards/sifive/hifive1/hifive1.yaml similarity index 100% rename from boards/boards_legacy/riscv/hifive1/hifive1.yaml rename to boards/sifive/hifive1/hifive1.yaml diff --git a/boards/boards_legacy/riscv/hifive1/hifive1_defconfig b/boards/sifive/hifive1/hifive1_defconfig similarity index 59% rename from boards/boards_legacy/riscv/hifive1/hifive1_defconfig rename to boards/sifive/hifive1/hifive1_defconfig index 8e4e8e21c1a..873fe07b795 100644 --- a/boards/boards_legacy/riscv/hifive1/hifive1_defconfig +++ b/boards/sifive/hifive1/hifive1_defconfig @@ -1,13 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SIFIVE_FREEDOM_E300=y -CONFIG_SOC_SIFIVE_FREEDOM_E340=y -CONFIG_BOARD_HIFIVE1=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_SIFIVE_PORT_0=y CONFIG_UART_CONSOLE=y CONFIG_PINCTRL=y CONFIG_GPIO=y -CONFIG_QEMU_ICOUNT_SHIFT=6 CONFIG_BUILD_OUTPUT_HEX=y diff --git a/boards/boards_legacy/riscv/hifive1/support/hifive1.resc b/boards/sifive/hifive1/support/hifive1.resc similarity index 100% rename from boards/boards_legacy/riscv/hifive1/support/hifive1.resc rename to boards/sifive/hifive1/support/hifive1.resc diff --git a/boards/boards_legacy/riscv/hifive1/support/openocd.cfg b/boards/sifive/hifive1/support/openocd.cfg similarity index 100% rename from boards/boards_legacy/riscv/hifive1/support/openocd.cfg rename to boards/sifive/hifive1/support/openocd.cfg diff --git a/boards/sifive/index.rst b/boards/sifive/index.rst new file mode 100644 index 00000000000..2249014c08e --- /dev/null +++ b/boards/sifive/index.rst @@ -0,0 +1,10 @@ +.. _boards-sifive: + +SiFive +###### + +.. toctree:: + :maxdepth: 1 + :glob: + + **/*