From ae02fc5047b7cd40a315537a2ccf2c58a89c78a5 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Thu, 11 Jan 2024 12:04:02 +0000
Subject: [PATCH] boards: sparc: qemu_leon3: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../qemu_leon3/Kconfig.board => v2/qemu/qemu_leon3/Kconfig} | 2 --
 boards/{sparc => v2/qemu}/qemu_leon3/Kconfig.defconfig      | 3 ---
 boards/v2/qemu/qemu_leon3/Kconfig.qemu_leon3                | 6 ++++++
 boards/{sparc => v2/qemu}/qemu_leon3/board.cmake            | 0
 boards/v2/qemu/qemu_leon3/board.yml                         | 5 +++++
 boards/{sparc => v2/qemu}/qemu_leon3/doc/index.rst          | 0
 boards/{sparc => v2/qemu}/qemu_leon3/qemu_leon3.dts         | 0
 boards/{sparc => v2/qemu}/qemu_leon3/qemu_leon3.yaml        | 0
 boards/{sparc => v2/qemu}/qemu_leon3/qemu_leon3_defconfig   | 2 --
 9 files changed, 11 insertions(+), 7 deletions(-)
 rename boards/{sparc/qemu_leon3/Kconfig.board => v2/qemu/qemu_leon3/Kconfig} (75%)
 rename boards/{sparc => v2/qemu}/qemu_leon3/Kconfig.defconfig (80%)
 create mode 100644 boards/v2/qemu/qemu_leon3/Kconfig.qemu_leon3
 rename boards/{sparc => v2/qemu}/qemu_leon3/board.cmake (100%)
 create mode 100644 boards/v2/qemu/qemu_leon3/board.yml
 rename boards/{sparc => v2/qemu}/qemu_leon3/doc/index.rst (100%)
 rename boards/{sparc => v2/qemu}/qemu_leon3/qemu_leon3.dts (100%)
 rename boards/{sparc => v2/qemu}/qemu_leon3/qemu_leon3.yaml (100%)
 rename boards/{sparc => v2/qemu}/qemu_leon3/qemu_leon3_defconfig (77%)

diff --git a/boards/sparc/qemu_leon3/Kconfig.board b/boards/v2/qemu/qemu_leon3/Kconfig
similarity index 75%
rename from boards/sparc/qemu_leon3/Kconfig.board
rename to boards/v2/qemu/qemu_leon3/Kconfig
index 6ba0234a17a..f99064ef58c 100644
--- a/boards/sparc/qemu_leon3/Kconfig.board
+++ b/boards/v2/qemu/qemu_leon3/Kconfig
@@ -3,7 +3,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_QEMU_LEON3
-	bool "QEMU LEON3 target"
-	depends on SOC_LEON3
 	select QEMU_TARGET
 	select CPU_HAS_FPU
diff --git a/boards/sparc/qemu_leon3/Kconfig.defconfig b/boards/v2/qemu/qemu_leon3/Kconfig.defconfig
similarity index 80%
rename from boards/sparc/qemu_leon3/Kconfig.defconfig
rename to boards/v2/qemu/qemu_leon3/Kconfig.defconfig
index 0a48c2a4752..f90c04a345c 100644
--- a/boards/sparc/qemu_leon3/Kconfig.defconfig
+++ b/boards/v2/qemu/qemu_leon3/Kconfig.defconfig
@@ -4,9 +4,6 @@
 
 if BOARD_QEMU_LEON3
 
-config BOARD
-	default "qemu_leon3"
-
 config UART_INTERRUPT_DRIVEN
 	default y
 
diff --git a/boards/v2/qemu/qemu_leon3/Kconfig.qemu_leon3 b/boards/v2/qemu/qemu_leon3/Kconfig.qemu_leon3
new file mode 100644
index 00000000000..06d2be337b0
--- /dev/null
+++ b/boards/v2/qemu/qemu_leon3/Kconfig.qemu_leon3
@@ -0,0 +1,6 @@
+# Copyright (c) 2019-2020 Cobham Gaisler AB
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_QEMU_LEON3
+	select SOC_LEON3
diff --git a/boards/sparc/qemu_leon3/board.cmake b/boards/v2/qemu/qemu_leon3/board.cmake
similarity index 100%
rename from boards/sparc/qemu_leon3/board.cmake
rename to boards/v2/qemu/qemu_leon3/board.cmake
diff --git a/boards/v2/qemu/qemu_leon3/board.yml b/boards/v2/qemu/qemu_leon3/board.yml
new file mode 100644
index 00000000000..dd4875b879a
--- /dev/null
+++ b/boards/v2/qemu/qemu_leon3/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: qemu_leon3
+  vendor: Gaisler
+  socs:
+  - name: leon3
diff --git a/boards/sparc/qemu_leon3/doc/index.rst b/boards/v2/qemu/qemu_leon3/doc/index.rst
similarity index 100%
rename from boards/sparc/qemu_leon3/doc/index.rst
rename to boards/v2/qemu/qemu_leon3/doc/index.rst
diff --git a/boards/sparc/qemu_leon3/qemu_leon3.dts b/boards/v2/qemu/qemu_leon3/qemu_leon3.dts
similarity index 100%
rename from boards/sparc/qemu_leon3/qemu_leon3.dts
rename to boards/v2/qemu/qemu_leon3/qemu_leon3.dts
diff --git a/boards/sparc/qemu_leon3/qemu_leon3.yaml b/boards/v2/qemu/qemu_leon3/qemu_leon3.yaml
similarity index 100%
rename from boards/sparc/qemu_leon3/qemu_leon3.yaml
rename to boards/v2/qemu/qemu_leon3/qemu_leon3.yaml
diff --git a/boards/sparc/qemu_leon3/qemu_leon3_defconfig b/boards/v2/qemu/qemu_leon3/qemu_leon3_defconfig
similarity index 77%
rename from boards/sparc/qemu_leon3/qemu_leon3_defconfig
rename to boards/v2/qemu/qemu_leon3/qemu_leon3_defconfig
index 7f57d930478..72f7285f608 100644
--- a/boards/sparc/qemu_leon3/qemu_leon3_defconfig
+++ b/boards/v2/qemu/qemu_leon3/qemu_leon3_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_LEON3=y
-CONFIG_BOARD_QEMU_LEON3=y
 CONFIG_CONSOLE=y
 CONFIG_SERIAL=y
 CONFIG_UART_CONSOLE=y