boards: arm: mercury_xu: Convert to v2

Converts the board to hwmv2 Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
1 year ago · dafbd638e4
9 changed files with 11 additions and 10 deletions
--- a/boards/boards_legacy/arm/mercury_xu/CMakeLists.txt
+++ b/boards/boards_legacy/arm/mercury_xu/CMakeLists.txt
@ -1,4 +1,5 @@
				@@ -1,4 +1,5 @@
 # Copyright (c) 2020, Antmicro
 # SPDX-License-Identifier: Apache-2.0
+
 zephyr_library()
 zephyr_library_sources(board.c)
--- a/boards/boards_legacy/arm/mercury_xu/Kconfig.defconfig
+++ b/boards/boards_legacy/arm/mercury_xu/Kconfig.defconfig
@ -3,9 +3,6 @@
				@@ -3,9 +3,6 @@

 if BOARD_MERCURY_XU

-config BOARD
-	default "mercury_xu"
-
 config FLASH_SIZE
 	int
 	default 64
--- a/boards/boards_legacy/arm/mercury_xu/Kconfig.board
+++ b/boards/boards_legacy/arm/mercury_xu/Kconfig.board
@ -1,5 +1,5 @@
				@@ -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
--- a/boards/boards_legacy/arm/mercury_xu/board.c
+++ b/boards/boards_legacy/arm/mercury_xu/board.c
--- a/boards/enclustra/mercury_xu/board.yml
+++ b/boards/enclustra/mercury_xu/board.yml
@ -0,0 +1,5 @@
				@@ -0,0 +1,5 @@
+board:
+  name: mercury_xu
+  vendor: Enclustra
+  socs:
+  - name: zynqmp_rpu
--- a/boards/boards_legacy/arm/mercury_xu/mercury_xu-pinctrl.dtsi
+++ b/boards/boards_legacy/arm/mercury_xu/mercury_xu-pinctrl.dtsi
--- a/boards/boards_legacy/arm/mercury_xu/mercury_xu.dts
+++ b/boards/boards_legacy/arm/mercury_xu/mercury_xu.dts
--- a/boards/boards_legacy/arm/mercury_xu/mercury_xu.yaml
+++ b/boards/boards_legacy/arm/mercury_xu/mercury_xu.yaml
--- a/boards/boards_legacy/arm/mercury_xu/mercury_xu_defconfig
+++ b/boards/boards_legacy/arm/mercury_xu/mercury_xu_defconfig
@ -1,15 +1,13 @@
				@@ -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