From 97401c7d2a64dedf21f567eebea46ab4474872c0 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 15 Jan 2024 08:55:47 +0000 Subject: [PATCH] boards: mips: qemu_malta: Convert to v2 Converts the board to hwmv2 Signed-off-by: Jamie McCrae --- boards/mips/qemu_malta/Kconfig.board | 16 ---------------- boards/mips/qemu_malta/Kconfig.defconfig | 16 ---------------- boards/v2/qemu/qemu_malta/Kconfig | 9 +++++++++ boards/v2/qemu/qemu_malta/Kconfig.defconfig | 12 ++++++++++++ boards/v2/qemu/qemu_malta/Kconfig.qemu_malta | 8 ++++++++ boards/{mips => v2/qemu}/qemu_malta/board.cmake | 0 boards/v2/qemu/qemu_malta/board.yml | 7 +++++++ .../{mips => v2/qemu}/qemu_malta/doc/index.rst | 2 +- .../{mips => v2/qemu}/qemu_malta/qemu_malta.dts | 0 .../{mips => v2/qemu}/qemu_malta/qemu_malta.yaml | 0 .../qemu}/qemu_malta/qemu_malta_be.dts | 0 .../qemu}/qemu_malta/qemu_malta_be.yaml | 2 +- .../qemu}/qemu_malta/qemu_malta_be_defconfig | 2 -- .../qemu}/qemu_malta/qemu_malta_defconfig | 2 -- 14 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 boards/mips/qemu_malta/Kconfig.board delete mode 100644 boards/mips/qemu_malta/Kconfig.defconfig create mode 100644 boards/v2/qemu/qemu_malta/Kconfig create mode 100644 boards/v2/qemu/qemu_malta/Kconfig.defconfig create mode 100644 boards/v2/qemu/qemu_malta/Kconfig.qemu_malta rename boards/{mips => v2/qemu}/qemu_malta/board.cmake (100%) create mode 100644 boards/v2/qemu/qemu_malta/board.yml rename boards/{mips => v2/qemu}/qemu_malta/doc/index.rst (99%) rename boards/{mips => v2/qemu}/qemu_malta/qemu_malta.dts (100%) rename boards/{mips => v2/qemu}/qemu_malta/qemu_malta.yaml (100%) rename boards/{mips => v2/qemu}/qemu_malta/qemu_malta_be.dts (100%) rename boards/{mips => v2/qemu}/qemu_malta/qemu_malta_be.yaml (88%) rename boards/{mips => v2/qemu}/qemu_malta/qemu_malta_be_defconfig (70%) rename boards/{mips => v2/qemu}/qemu_malta/qemu_malta_defconfig (71%) diff --git a/boards/mips/qemu_malta/Kconfig.board b/boards/mips/qemu_malta/Kconfig.board deleted file mode 100644 index 4716bd6dbe5..00000000000 --- a/boards/mips/qemu_malta/Kconfig.board +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2020 Antony Pavlov -# -# SPDX-License-Identifier: Apache-2.0 -# - -config BOARD_QEMU_MALTA - bool "QEMU emulation for little endian MIPS Malta" - depends on SOC_QEMU_MALTA - select QEMU_TARGET - -config BOARD_QEMU_MALTA_BE - bool "QEMU emulation for big endian MIPS Malta" - depends on SOC_QEMU_MALTA - select QEMU_TARGET - select BIG_ENDIAN diff --git a/boards/mips/qemu_malta/Kconfig.defconfig b/boards/mips/qemu_malta/Kconfig.defconfig deleted file mode 100644 index 4a583be0d9e..00000000000 --- a/boards/mips/qemu_malta/Kconfig.defconfig +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright (c) 2020 Antony Pavlov -# -# SPDX-License-Identifier: Apache-2.0 -# - -if BOARD_QEMU_MALTA || BOARD_QEMU_MALTA_BE - -config BUILD_OUTPUT_BIN - default n - -config BOARD - default "qemu_malta" if BOARD_QEMU_MALTA - default "qemu_malta_be" if BOARD_QEMU_MALTA_BE - -endif # BOARD_QEMU_MALTA || BOARD_QEMU_MALTA_BE diff --git a/boards/v2/qemu/qemu_malta/Kconfig b/boards/v2/qemu/qemu_malta/Kconfig new file mode 100644 index 00000000000..5813610828d --- /dev/null +++ b/boards/v2/qemu/qemu_malta/Kconfig @@ -0,0 +1,9 @@ +# +# Copyright (c) 2020 Antony Pavlov +# +# SPDX-License-Identifier: Apache-2.0 +# + +config BOARD_QEMU_MALTA + select QEMU_TARGET + select BIG_ENDIAN if BOARD_QEMU_MALTA_QEMU_MALTA_BE diff --git a/boards/v2/qemu/qemu_malta/Kconfig.defconfig b/boards/v2/qemu/qemu_malta/Kconfig.defconfig new file mode 100644 index 00000000000..fb24d3b5b47 --- /dev/null +++ b/boards/v2/qemu/qemu_malta/Kconfig.defconfig @@ -0,0 +1,12 @@ +# +# Copyright (c) 2020 Antony Pavlov +# +# SPDX-License-Identifier: Apache-2.0 +# + +if BOARD_QEMU_MALTA + +config BUILD_OUTPUT_BIN + default n + +endif # BOARD_QEMU_MALTA diff --git a/boards/v2/qemu/qemu_malta/Kconfig.qemu_malta b/boards/v2/qemu/qemu_malta/Kconfig.qemu_malta new file mode 100644 index 00000000000..fe93f3b3874 --- /dev/null +++ b/boards/v2/qemu/qemu_malta/Kconfig.qemu_malta @@ -0,0 +1,8 @@ +# +# Copyright (c) 2020 Antony Pavlov +# +# SPDX-License-Identifier: Apache-2.0 +# + +config BOARD_QEMU_MALTA + select SOC_QEMU_MALTA diff --git a/boards/mips/qemu_malta/board.cmake b/boards/v2/qemu/qemu_malta/board.cmake similarity index 100% rename from boards/mips/qemu_malta/board.cmake rename to boards/v2/qemu/qemu_malta/board.cmake diff --git a/boards/v2/qemu/qemu_malta/board.yml b/boards/v2/qemu/qemu_malta/board.yml new file mode 100644 index 00000000000..9f9c0e0df5d --- /dev/null +++ b/boards/v2/qemu/qemu_malta/board.yml @@ -0,0 +1,7 @@ +board: + name: qemu_malta + vendor: QEMU + socs: + - name: qemu_malta + variants: + - name: 'be' diff --git a/boards/mips/qemu_malta/doc/index.rst b/boards/v2/qemu/qemu_malta/doc/index.rst similarity index 99% rename from boards/mips/qemu_malta/doc/index.rst rename to boards/v2/qemu/qemu_malta/doc/index.rst index abca3138061..178d787f951 100644 --- a/boards/mips/qemu_malta/doc/index.rst +++ b/boards/v2/qemu/qemu_malta/doc/index.rst @@ -95,7 +95,7 @@ Use this configuration to run :zephyr:code-sample:`synchronization` sample in bi .. zephyr-app-commands:: :zephyr-app: samples/synchronization :host-os: unix - :board: qemu_malta_be + :board: qemu_malta//be :goals: run diff --git a/boards/mips/qemu_malta/qemu_malta.dts b/boards/v2/qemu/qemu_malta/qemu_malta.dts similarity index 100% rename from boards/mips/qemu_malta/qemu_malta.dts rename to boards/v2/qemu/qemu_malta/qemu_malta.dts diff --git a/boards/mips/qemu_malta/qemu_malta.yaml b/boards/v2/qemu/qemu_malta/qemu_malta.yaml similarity index 100% rename from boards/mips/qemu_malta/qemu_malta.yaml rename to boards/v2/qemu/qemu_malta/qemu_malta.yaml diff --git a/boards/mips/qemu_malta/qemu_malta_be.dts b/boards/v2/qemu/qemu_malta/qemu_malta_be.dts similarity index 100% rename from boards/mips/qemu_malta/qemu_malta_be.dts rename to boards/v2/qemu/qemu_malta/qemu_malta_be.dts diff --git a/boards/mips/qemu_malta/qemu_malta_be.yaml b/boards/v2/qemu/qemu_malta/qemu_malta_be.yaml similarity index 88% rename from boards/mips/qemu_malta/qemu_malta_be.yaml rename to boards/v2/qemu/qemu_malta/qemu_malta_be.yaml index 91a9444d00b..98aa9884dbf 100644 --- a/boards/mips/qemu_malta/qemu_malta_be.yaml +++ b/boards/v2/qemu/qemu_malta/qemu_malta_be.yaml @@ -1,4 +1,4 @@ -identifier: qemu_malta_be +identifier: qemu_malta//be name: QEMU emulation for MIPS (big endian) type: qemu simulation: qemu diff --git a/boards/mips/qemu_malta/qemu_malta_be_defconfig b/boards/v2/qemu/qemu_malta/qemu_malta_be_defconfig similarity index 70% rename from boards/mips/qemu_malta/qemu_malta_be_defconfig rename to boards/v2/qemu/qemu_malta/qemu_malta_be_defconfig index cbdcfed736a..fe217db926b 100644 --- a/boards/mips/qemu_malta/qemu_malta_be_defconfig +++ b/boards/v2/qemu/qemu_malta/qemu_malta_be_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_MALTA=y -CONFIG_BOARD_QEMU_MALTA_BE=y CONFIG_MIPS_CP0_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y diff --git a/boards/mips/qemu_malta/qemu_malta_defconfig b/boards/v2/qemu/qemu_malta/qemu_malta_defconfig similarity index 71% rename from boards/mips/qemu_malta/qemu_malta_defconfig rename to boards/v2/qemu/qemu_malta/qemu_malta_defconfig index edf9e147897..fe217db926b 100644 --- a/boards/mips/qemu_malta/qemu_malta_defconfig +++ b/boards/v2/qemu/qemu_malta/qemu_malta_defconfig @@ -1,5 +1,3 @@ -CONFIG_SOC_QEMU_MALTA=y -CONFIG_BOARD_QEMU_MALTA=y CONFIG_MIPS_CP0_TIMER=y CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y