From 545093abe424315bffadcb40fb99234db68da6b4 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sun, 11 Feb 2024 17:58:03 +0100 Subject: [PATCH] boards: riscv: niosv_g: move and convert to HWMv2 Move and convert to HWMv2 riscv/niosv_g board configuration. Signed-off-by: Dmitrii Golovanov --- boards/boards_legacy/riscv/niosv_g/Kconfig.board | 6 ------ boards/boards_legacy/riscv/niosv_g/Kconfig.defconfig | 9 --------- boards/intel/niosv_g/Kconfig.niosv_g | 8 ++++++++ boards/intel/niosv_g/board.yml | 4 ++++ .../{boards_legacy/riscv => intel}/niosv_g/doc/index.rst | 0 .../{boards_legacy/riscv => intel}/niosv_g/niosv_g.dts | 0 .../{boards_legacy/riscv => intel}/niosv_g/niosv_g.yaml | 0 .../riscv => intel}/niosv_g/niosv_g_defconfig | 6 ++---- 8 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 boards/boards_legacy/riscv/niosv_g/Kconfig.board delete mode 100644 boards/boards_legacy/riscv/niosv_g/Kconfig.defconfig create mode 100644 boards/intel/niosv_g/Kconfig.niosv_g create mode 100644 boards/intel/niosv_g/board.yml rename boards/{boards_legacy/riscv => intel}/niosv_g/doc/index.rst (100%) rename boards/{boards_legacy/riscv => intel}/niosv_g/niosv_g.dts (100%) rename boards/{boards_legacy/riscv => intel}/niosv_g/niosv_g.yaml (100%) rename boards/{boards_legacy/riscv => intel}/niosv_g/niosv_g_defconfig (52%) diff --git a/boards/boards_legacy/riscv/niosv_g/Kconfig.board b/boards/boards_legacy/riscv/niosv_g/Kconfig.board deleted file mode 100644 index bcc48f497d8..00000000000 --- a/boards/boards_legacy/riscv/niosv_g/Kconfig.board +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2023, Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_NIOSV_G - bool "Intel FPGA Nios V/g General Purpose Processor" - depends on SOC_NIOSV_G diff --git a/boards/boards_legacy/riscv/niosv_g/Kconfig.defconfig b/boards/boards_legacy/riscv/niosv_g/Kconfig.defconfig deleted file mode 100644 index ecfc8b41bab..00000000000 --- a/boards/boards_legacy/riscv/niosv_g/Kconfig.defconfig +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2023, Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_NIOSV_G - -config BOARD - default "niosv_g" - -endif # BOARD_NIOSV_G diff --git a/boards/intel/niosv_g/Kconfig.niosv_g b/boards/intel/niosv_g/Kconfig.niosv_g new file mode 100644 index 00000000000..2d07c1b5e15 --- /dev/null +++ b/boards/intel/niosv_g/Kconfig.niosv_g @@ -0,0 +1,8 @@ +# Copyright (C) 2023-2024, Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_NIOSV_G + select SOC_NIOSV_G + help + Intel FPGA Nios V/g General Purpose Processor diff --git a/boards/intel/niosv_g/board.yml b/boards/intel/niosv_g/board.yml new file mode 100644 index 00000000000..7f6cc30ce62 --- /dev/null +++ b/boards/intel/niosv_g/board.yml @@ -0,0 +1,4 @@ +board: + name: niosv_g + socs: + - name: niosv_g diff --git a/boards/boards_legacy/riscv/niosv_g/doc/index.rst b/boards/intel/niosv_g/doc/index.rst similarity index 100% rename from boards/boards_legacy/riscv/niosv_g/doc/index.rst rename to boards/intel/niosv_g/doc/index.rst diff --git a/boards/boards_legacy/riscv/niosv_g/niosv_g.dts b/boards/intel/niosv_g/niosv_g.dts similarity index 100% rename from boards/boards_legacy/riscv/niosv_g/niosv_g.dts rename to boards/intel/niosv_g/niosv_g.dts diff --git a/boards/boards_legacy/riscv/niosv_g/niosv_g.yaml b/boards/intel/niosv_g/niosv_g.yaml similarity index 100% rename from boards/boards_legacy/riscv/niosv_g/niosv_g.yaml rename to boards/intel/niosv_g/niosv_g.yaml diff --git a/boards/boards_legacy/riscv/niosv_g/niosv_g_defconfig b/boards/intel/niosv_g/niosv_g_defconfig similarity index 52% rename from boards/boards_legacy/riscv/niosv_g/niosv_g_defconfig rename to boards/intel/niosv_g/niosv_g_defconfig index f933bca3874..27dd451aaf5 100644 --- a/boards/boards_legacy/riscv/niosv_g/niosv_g_defconfig +++ b/boards/intel/niosv_g/niosv_g_defconfig @@ -1,9 +1,7 @@ -# Copyright (C) 2023, Intel Corporation +# Copyright (C) 2023-2024, Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_NIOSV=y -CONFIG_SOC_NIOSV_G=y -CONFIG_BOARD_NIOSV_G=y CONFIG_CONSOLE=y CONFIG_PRINTK=y CONFIG_SERIAL=y