From e82932e787099366e7973d6ce0ec544fc60a9f83 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Wed, 14 Feb 2024 08:50:49 +0000 Subject: [PATCH] boards: riscv: litex_vexriscv: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- .../litex_vexriscv/Kconfig.defconfig | 3 --- .../litex_vexriscv/Kconfig.litex_vexriscv} | 3 +-- boards/litex/litex_vexriscv/board.yml | 5 +++++ .../litex_vexriscv/doc/img/litex_vexriscv.jpg | Bin .../litex_vexriscv/doc/img/symbiflow.svg | 0 .../riscv => litex}/litex_vexriscv/doc/index.rst | 0 .../litex_vexriscv/litex_vexriscv.dts | 0 .../litex_vexriscv/litex_vexriscv.yaml | 0 .../litex_vexriscv/litex_vexriscv_defconfig | 2 -- drivers/hwinfo/Kconfig | 2 +- 10 files changed, 7 insertions(+), 8 deletions(-) rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/Kconfig.defconfig (84%) rename boards/{boards_legacy/riscv/litex_vexriscv/Kconfig.board => litex/litex_vexriscv/Kconfig.litex_vexriscv} (61%) create mode 100644 boards/litex/litex_vexriscv/board.yml rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/doc/img/litex_vexriscv.jpg (100%) rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/doc/img/symbiflow.svg (100%) rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/doc/index.rst (100%) rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/litex_vexriscv.dts (100%) rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/litex_vexriscv.yaml (100%) rename boards/{boards_legacy/riscv => litex}/litex_vexriscv/litex_vexriscv_defconfig (77%) diff --git a/boards/boards_legacy/riscv/litex_vexriscv/Kconfig.defconfig b/boards/litex/litex_vexriscv/Kconfig.defconfig similarity index 84% rename from boards/boards_legacy/riscv/litex_vexriscv/Kconfig.defconfig rename to boards/litex/litex_vexriscv/Kconfig.defconfig index ef0440b9a37..f48e777e7a7 100644 --- a/boards/boards_legacy/riscv/litex_vexriscv/Kconfig.defconfig +++ b/boards/litex/litex_vexriscv/Kconfig.defconfig @@ -3,9 +3,6 @@ if BOARD_LITEX_VEXRISCV -config BOARD - default "litex_vexriscv" - if NETWORKING config NET_L2_ETHERNET diff --git a/boards/boards_legacy/riscv/litex_vexriscv/Kconfig.board b/boards/litex/litex_vexriscv/Kconfig.litex_vexriscv similarity index 61% rename from boards/boards_legacy/riscv/litex_vexriscv/Kconfig.board rename to boards/litex/litex_vexriscv/Kconfig.litex_vexriscv index de9d8026b6a..ae3a15d3685 100644 --- a/boards/boards_legacy/riscv/litex_vexriscv/Kconfig.board +++ b/boards/litex/litex_vexriscv/Kconfig.litex_vexriscv @@ -2,5 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_LITEX_VEXRISCV - bool "Board with LiteX/VexRiscV CPU" - depends on SOC_RISCV32_LITEX_VEXRISCV + select SOC_LITEX_VEXRISCV diff --git a/boards/litex/litex_vexriscv/board.yml b/boards/litex/litex_vexriscv/board.yml new file mode 100644 index 00000000000..cc2ccc87a9d --- /dev/null +++ b/boards/litex/litex_vexriscv/board.yml @@ -0,0 +1,5 @@ +board: + name: litex_vexriscv + vendor: LiteX + socs: + - name: litex_vexriscv diff --git a/boards/boards_legacy/riscv/litex_vexriscv/doc/img/litex_vexriscv.jpg b/boards/litex/litex_vexriscv/doc/img/litex_vexriscv.jpg similarity index 100% rename from boards/boards_legacy/riscv/litex_vexriscv/doc/img/litex_vexriscv.jpg rename to boards/litex/litex_vexriscv/doc/img/litex_vexriscv.jpg diff --git a/boards/boards_legacy/riscv/litex_vexriscv/doc/img/symbiflow.svg b/boards/litex/litex_vexriscv/doc/img/symbiflow.svg similarity index 100% rename from boards/boards_legacy/riscv/litex_vexriscv/doc/img/symbiflow.svg rename to boards/litex/litex_vexriscv/doc/img/symbiflow.svg diff --git a/boards/boards_legacy/riscv/litex_vexriscv/doc/index.rst b/boards/litex/litex_vexriscv/doc/index.rst similarity index 100% rename from boards/boards_legacy/riscv/litex_vexriscv/doc/index.rst rename to boards/litex/litex_vexriscv/doc/index.rst diff --git a/boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv.dts b/boards/litex/litex_vexriscv/litex_vexriscv.dts similarity index 100% rename from boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv.dts rename to boards/litex/litex_vexriscv/litex_vexriscv.dts diff --git a/boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv.yaml b/boards/litex/litex_vexriscv/litex_vexriscv.yaml similarity index 100% rename from boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv.yaml rename to boards/litex/litex_vexriscv/litex_vexriscv.yaml diff --git a/boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv_defconfig b/boards/litex/litex_vexriscv/litex_vexriscv_defconfig similarity index 77% rename from boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv_defconfig rename to boards/litex/litex_vexriscv/litex_vexriscv_defconfig index b8730d07d06..d51a5923ff8 100644 --- a/boards/boards_legacy/riscv/litex_vexriscv/litex_vexriscv_defconfig +++ b/boards/litex/litex_vexriscv/litex_vexriscv_defconfig @@ -4,8 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -CONFIG_SOC_RISCV32_LITEX_VEXRISCV=y -CONFIG_BOARD_LITEX_VEXRISCV=y CONFIG_CONSOLE=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y diff --git a/drivers/hwinfo/Kconfig b/drivers/hwinfo/Kconfig index 84afbefd84f..c0eb1524a5b 100644 --- a/drivers/hwinfo/Kconfig +++ b/drivers/hwinfo/Kconfig @@ -166,7 +166,7 @@ config HWINFO_ESP32 config HWINFO_LITEX bool "LiteX device ID" default y - depends on SOC_RISCV32_LITEX_VEXRISCV + depends on SOC_LITEX_VEXRISCV help Enable LiteX hwinfo driver