boards: arm: nrf54h20pdk_nrf54h20: Convert to v2

Converts the board to hwmv2

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boards/boards_legacy/arm/nrf54h20pdk_nrf54h20/Kconfig.board

@@ -1,10 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NRF54H20PDK_NRF54H20_CPUAPP
-	bool "nRF54H20 PDK nRF54H20 Application MCU"
-	depends on SOC_NRF54H20_ENGA_CPUAPP
-
-config BOARD_NRF54H20PDK_NRF54H20_CPURAD
-	bool "nRF54H20 PDK nRF54H20 Radio MCU"
-	depends on SOC_NRF54H20_ENGA_CPURAD

boards/boards_legacy/arm/nrf54h20pdk_nrf54h20/Kconfig.defconfig

@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD
-	default "nrf54h20pdk_nrf54h20_cpuapp" if BOARD_NRF54H20PDK_NRF54H20_CPUAPP
-	default "nrf54h20pdk_nrf54h20_cpurad" if BOARD_NRF54H20PDK_NRF54H20_CPURAD
-
-if BOARD_NRF54H20PDK_NRF54H20_CPUAPP || BOARD_NRF54H20PDK_NRF54H20_CPURAD
-
-# Data cache is disabled due to a HW issue in the EngA SoC revision.
-config DCACHE
-	default n
-
-endif # BOARD_NRF54H20PDK_NRF54H20_CPUAPP || BOARD_NRF54H20PDK_NRF54H20_CPURAD

boards/boards_legacy/riscv/nrf54h20pdk_nrf54h20/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NRF54H20PDK_NRF54H20_CPUPPR
-	bool "nRF54H20 PDK nRF54H20 PPR MCU"
-	depends on SOC_NRF54H20_ENGA_CPUPPR

boards/boards_legacy/riscv/nrf54h20pdk_nrf54h20/Kconfig.defconfig

@@ -1,6 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD
-	default "nrf54h20pdk_nrf54h20_cpuppr"
-	depends on BOARD_NRF54H20PDK_NRF54H20_CPUPPR

boards/boards_legacy/riscv/nrf54h20pdk_nrf54h20/board.cmake

@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)

boards/boards_legacy/riscv/nrf54h20pdk_nrf54h20/nrf54h20pdk_nrf54h20_cpuppr_defconfig

@@ -1,14 +0,0 @@
-# Copyright (c) 2024 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_SERIES_NRF54HX=y
-CONFIG_SOC_NRF54H20=y
-CONFIG_SOC_NRF54H20_ENGA_CPUPPR=y
-CONFIG_BOARD_NRF54H20PDK_NRF54H20_CPUPPR=y
-
-CONFIG_USE_DT_CODE_PARTITION=y
-
-CONFIG_SERIAL=y
-
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y

boards/nordic_nrf/nrf54h20pdk/Kconfig.defconfig

@@ -0,0 +1,10 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF54H20PDK
+
+# Data cache is disabled due to a HW issue in the EngA SoC revision.
+config DCACHE
+	default n
+
+endif # BOARD_NRF54H20PDK

boards/nordic_nrf/nrf54h20pdk/Kconfig.nrf54h20pdk

@@ -0,0 +1,7 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF54H20PDK
+	select SOC_NRF54H20_ENGA_CPUAPP if BOARD_NRF54H20PDK_NRF54H20_CPUAPP
+	select SOC_NRF54H20_ENGA_CPURAD if BOARD_NRF54H20PDK_NRF54H20_CPURAD
+	select SOC_NRF54H20_ENGA_CPUPPR if BOARD_NRF54H20PDK_NRF54H20_CPUPPR

boards/nordic_nrf/nrf54h20pdk/board.yml

@@ -0,0 +1,5 @@
+board:
+  name: nrf54h20pdk
+  vendor: Nordic Semiconductor
+  socs:
+  - name: nrf54h20

boards/nordic_nrf/nrf54h20pdk/doc/index.rst

@@ -21,9 +21,9 @@ The nRF54H20 is a multicore SoC with:
 * an Arm Cortex-M33 core with DSP instructions, FPU, and Armv8-M Security
   Extensions, running at up to 256 MHz, referred to as the **radio core**.
 
-The ``nrf54h20pdk_nrf54h20_cpuapp`` build target provides support for
+The ``nrf54h20pdk/nrf54h20/cpuapp`` build target provides support for
 the application core on the nRF54H20 SoC.
-The ``nrf54h20pdk_nrf54h20_cpurad`` build target provides support for
+The ``nrf54h20pdk/nrf54h20/cpurad`` build target provides support for
 the radio core on the nRF54H20 SoC.
 
 nRF54H20 SoC provides support for the following devices:
@@ -59,7 +59,7 @@ nRF54H20 PDK has two crystal oscillators:
 Supported Features
 ==================
 
-The nrf54h20pdk_nrf54h20_cpuapp board configuration supports the following
+The ``nrf54h20pdk/nrf54h20/cpuapp`` board configuration supports the following
 hardware features:
 
 +-----------+------------+----------------------+
@@ -74,7 +74,7 @@ hardware features:
 | UART      | on-chip    | serial               |
 +-----------+------------+----------------------+
 
-The nrf54h20pdk_nrf54h20_cpurad board configuration supports the following
+The ``nrf54h20pdk/nrf54h20/cpurad`` board configuration supports the following
 hardware features:
 
 +-----------+------------+----------------------+
@@ -114,8 +114,8 @@ Push buttons
 Programming and Debugging
 *************************
 
-Applications for both the ``nrf54h20pdk_nrf54h20_cpuapp`` and
-``nrf54h20pdk_nrf54h20_cpurad`` targets can be built, flashed,
+Applications for both the ``nrf54h20pdk/nrf54h20/cpuapp`` and
+``nrf54h20pdk/nrf54h20/cpurad`` targets can be built, flashed,
 and debugged in the usual way. See :ref:`build_an_application`
 and :ref:`application_run` for more details on building and running.
 
@@ -136,7 +136,7 @@ Next, build the sample by running the following command:
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: nrf54h20pdk_nrf54h20_cpuapp
+   :board: nrf54h20pdk/nrf54h20/cpuapp
    :goals: build flash
 
 Testing the LEDs and buttons in the nRF54H20 PDK
@@ -150,4 +150,4 @@ on the board are working properly with Zephyr:
 
 You can build and flash the examples to make sure Zephyr is running correctly on
 your board. The button and LED definitions can be found in
-:zephyr_file:`boards/arm/nrf54h20pdk_nrf54h20/nrf54h20pdk_nrf54h20_cpuapp.dts`.
+:zephyr_file:`boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpuapp.dts`.

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_defconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpuapp.yaml

@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20pdk_nrf54h20_cpuapp
+identifier: nrf54h20pdk/nrf54h20/cpuapp
 name: nRF54H20-PDK-nRF54H20-Application
 type: mcu
 arch: arm

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpuapp_defconfig

@@ -1,11 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF54HX=y
-CONFIG_SOC_NRF54H20=y
-CONFIG_SOC_NRF54H20_ENGA_CPUAPP=y
-CONFIG_BOARD_NRF54H20PDK_NRF54H20_CPUAPP=y
-
 CONFIG_USE_DT_CODE_PARTITION=y
 
 # Enable MPU
@@ -24,10 +19,3 @@ CONFIG_EXTERNAL_CACHE=y
 
 # Enable GPIO
 CONFIG_GPIO=y
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpuppr.yaml

@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20pdk_nrf54h20_cpuppr
+identifier: nrf54h20pdk/nrf54h20/cpuppr
 name: nRF54H20-PDK-nRF54H20-PPR
 type: mcu
 arch: riscv

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpuppr_defconfig

@@ -0,0 +1,4 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+CONFIG_USE_DT_CODE_PARTITION=y

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpurad.yaml

@@ -1,7 +1,7 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-identifier: nrf54h20pdk_nrf54h20_cpurad
+identifier: nrf54h20pdk/nrf54h20/cpurad
 name: nRF54H20-PDK-nRF54H20-Radio
 type: mcu
 arch: arm

boards/nordic_nrf/nrf54h20pdk/nrf54h20pdk_nrf54h20_cpurad_defconfig

@@ -1,11 +1,6 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF54HX=y
-CONFIG_SOC_NRF54H20=y
-CONFIG_SOC_NRF54H20_ENGA_CPURAD=y
-CONFIG_BOARD_NRF54H20PDK_NRF54H20_CPURAD=y
-
 CONFIG_USE_DT_CODE_PARTITION=y
 
 # Enable MPU
@@ -21,10 +16,3 @@ CONFIG_NULL_POINTER_EXCEPTION_DETECTION_NONE=y
 # Enable cache
 CONFIG_CACHE_MANAGEMENT=y
 CONFIG_EXTERNAL_CACHE=y
-
-# Enable UART driver
-CONFIG_SERIAL=y
-
-# Enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y