From dafbd638e4dad49d2cd3bcbaf5061dcb544b5acb Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Fri, 2 Feb 2024 11:10:46 +0000
Subject: [PATCH] boards: arm: mercury_xu: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../arm => enclustra}/mercury_xu/CMakeLists.txt           | 1 +
 .../arm => enclustra}/mercury_xu/Kconfig.defconfig        | 3 ---
 .../mercury_xu/Kconfig.mercury_xu}                        | 4 ++--
 .../{boards_legacy/arm => enclustra}/mercury_xu/board.c   | 0
 boards/enclustra/mercury_xu/board.yml                     | 5 +++++
 .../arm => enclustra}/mercury_xu/mercury_xu-pinctrl.dtsi  | 0
 .../arm => enclustra}/mercury_xu/mercury_xu.dts           | 0
 .../arm => enclustra}/mercury_xu/mercury_xu.yaml          | 0
 .../arm => enclustra}/mercury_xu/mercury_xu_defconfig     | 8 +++-----
 9 files changed, 11 insertions(+), 10 deletions(-)
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/CMakeLists.txt (99%)
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/Kconfig.defconfig (83%)
 rename boards/{boards_legacy/arm/mercury_xu/Kconfig.board => enclustra/mercury_xu/Kconfig.mercury_xu} (61%)
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/board.c (100%)
 create mode 100644 boards/enclustra/mercury_xu/board.yml
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/mercury_xu-pinctrl.dtsi (100%)
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/mercury_xu.dts (100%)
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/mercury_xu.yaml (100%)
 rename boards/{boards_legacy/arm => enclustra}/mercury_xu/mercury_xu_defconfig (56%)

diff --git a/boards/boards_legacy/arm/mercury_xu/CMakeLists.txt b/boards/enclustra/mercury_xu/CMakeLists.txt
similarity index 99%
rename from boards/boards_legacy/arm/mercury_xu/CMakeLists.txt
rename to boards/enclustra/mercury_xu/CMakeLists.txt
index 191e22a607b..f1877356e3b 100644
--- a/boards/boards_legacy/arm/mercury_xu/CMakeLists.txt
+++ b/boards/enclustra/mercury_xu/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (c) 2020, Antmicro
 # SPDX-License-Identifier: Apache-2.0
+
 zephyr_library()
 zephyr_library_sources(board.c)
diff --git a/boards/boards_legacy/arm/mercury_xu/Kconfig.defconfig b/boards/enclustra/mercury_xu/Kconfig.defconfig
similarity index 83%
rename from boards/boards_legacy/arm/mercury_xu/Kconfig.defconfig
rename to boards/enclustra/mercury_xu/Kconfig.defconfig
index 856e4d2ac01..3a6d5d2a524 100644
--- a/boards/boards_legacy/arm/mercury_xu/Kconfig.defconfig
+++ b/boards/enclustra/mercury_xu/Kconfig.defconfig
@@ -3,9 +3,6 @@
 
 if BOARD_MERCURY_XU
 
-config BOARD
-	default "mercury_xu"
-
 config FLASH_SIZE
 	int
 	default 64
diff --git a/boards/boards_legacy/arm/mercury_xu/Kconfig.board b/boards/enclustra/mercury_xu/Kconfig.mercury_xu
similarity index 61%
rename from boards/boards_legacy/arm/mercury_xu/Kconfig.board
rename to boards/enclustra/mercury_xu/Kconfig.mercury_xu
index 929cf6db518..0cc9368f54f 100644
--- a/boards/boards_legacy/arm/mercury_xu/Kconfig.board
+++ b/boards/enclustra/mercury_xu/Kconfig.mercury_xu
@@ -1,5 +1,5 @@
 # Copyright (c) 2020, Antmicro
 # SPDX-License-Identifier: Apache-2.0
+
 config BOARD_MERCURY_XU
-	bool "Mercury XU Board"
-	depends on SOC_XILINX_ZYNQMP_RPU
+	select SOC_XILINX_ZYNQMP_RPU
diff --git a/boards/boards_legacy/arm/mercury_xu/board.c b/boards/enclustra/mercury_xu/board.c
similarity index 100%
rename from boards/boards_legacy/arm/mercury_xu/board.c
rename to boards/enclustra/mercury_xu/board.c
diff --git a/boards/enclustra/mercury_xu/board.yml b/boards/enclustra/mercury_xu/board.yml
new file mode 100644
index 00000000000..5645d0a9bad
--- /dev/null
+++ b/boards/enclustra/mercury_xu/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: mercury_xu
+  vendor: Enclustra
+  socs:
+  - name: zynqmp_rpu
diff --git a/boards/boards_legacy/arm/mercury_xu/mercury_xu-pinctrl.dtsi b/boards/enclustra/mercury_xu/mercury_xu-pinctrl.dtsi
similarity index 100%
rename from boards/boards_legacy/arm/mercury_xu/mercury_xu-pinctrl.dtsi
rename to boards/enclustra/mercury_xu/mercury_xu-pinctrl.dtsi
diff --git a/boards/boards_legacy/arm/mercury_xu/mercury_xu.dts b/boards/enclustra/mercury_xu/mercury_xu.dts
similarity index 100%
rename from boards/boards_legacy/arm/mercury_xu/mercury_xu.dts
rename to boards/enclustra/mercury_xu/mercury_xu.dts
diff --git a/boards/boards_legacy/arm/mercury_xu/mercury_xu.yaml b/boards/enclustra/mercury_xu/mercury_xu.yaml
similarity index 100%
rename from boards/boards_legacy/arm/mercury_xu/mercury_xu.yaml
rename to boards/enclustra/mercury_xu/mercury_xu.yaml
diff --git a/boards/boards_legacy/arm/mercury_xu/mercury_xu_defconfig b/boards/enclustra/mercury_xu/mercury_xu_defconfig
similarity index 56%
rename from boards/boards_legacy/arm/mercury_xu/mercury_xu_defconfig
rename to boards/enclustra/mercury_xu/mercury_xu_defconfig
index d01d7082f94..10ed71b13c9 100644
--- a/boards/boards_legacy/arm/mercury_xu/mercury_xu_defconfig
+++ b/boards/enclustra/mercury_xu/mercury_xu_defconfig
@@ -1,15 +1,13 @@
 # Copyright (c) 2020, Antmicro
-CONFIG_SOC_XILINX_ZYNQMP_RPU=y
-CONFIG_BOARD_MERCURY_XU=y
 
-# enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
-# enable timer
+# Enable timer
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 
 CONFIG_PINCTRL=y