boards: Update nrf5340dk_nrf5340 to HWMv2 scheme

This commit updates nrf5340dk_nrf5340 to use board scheme v2, and
thereby remove the Kconfig BOARD setting, as this is now passed from
CMake.

The nRF5340dk now support cpuapp and cpunet as cpusets, and the ns as
a build variant.

It also uses the new SoC approach, and thereby ensuring that the right
SoC is always used, and cannot accidentially be changed by the user.

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

boards/boards_legacy/arm/nrf5340dk_nrf5340/Kconfig.board

@@ -1,18 +0,0 @@
-# nRF5340 DK NRF5340 board configuration
-
-# Copyright (c) 2019-2020 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF5340_CPUAPP_QKAA
-
-config BOARD_NRF5340DK_NRF5340_CPUAPP
-	bool "nRF5340 DK nRF5340 Application MCU"
-
-config BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-	bool "nRF5340 DK nRF5340 Application MCU non-secure"
-
-endif # SOC_NRF5340_CPUAPP_QKAA
-
-config BOARD_NRF5340DK_NRF5340_CPUNET
-	bool "nRF5340 DK NRF5340 Network MCU"
-	depends on SOC_NRF5340_CPUNET_QKAA

boards/nordic_nrf/nrf5340dk/Kconfig.defconfig

@@ -5,9 +5,6 @@
 
 if  BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
-config BOARD
-	default "nrf5340dk_nrf5340_cpuapp" if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
-
 # Code Partition:
 #
 # For the secure version of the board the firmware is linked at the beginning
@@ -58,9 +55,6 @@ endif # BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
 endif # BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_NRF5340DK_NRF5340_CPUAPP_NS
 
-config BOARD
-	default "nrf5340dk_nrf5340_cpunet" if BOARD_NRF5340DK_NRF5340_CPUNET
-
 config MBOX_NRFX_IPC
 	default MBOX
 

boards/nordic_nrf/nrf5340dk/Kconfig.nrf5340dk

@@ -0,0 +1,7 @@
+# Copyright (c) 2022 Zephyr Project members and individual contributors
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF5340DK
+	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF5340DK_NRF5340_CPUAPP
+	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF5340DK_NRF5340_CPUAPP_NS
+	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF5340DK_NRF5340_CPUNET

boards/nordic_nrf/nrf5340dk/board.yml

@@ -0,0 +1,8 @@
+board:
+  name: nrf5340dk
+  vendor: Nordic Semiconductor
+  socs:
+  - name: 'nrf5340'
+    variants:
+    - name: 'ns'
+      cpucluster: 'cpuapp'

boards/nordic_nrf/nrf5340dk/doc/index.rst

@@ -315,7 +315,7 @@ LEDs 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/nrf5340dk_nrf5340/nrf5340_cpuapp_common.dtsi`.
+:zephyr_file:`boards/nordic_nrf/nrf5340dk/nrf5340_cpuapp_common.dtsi`.
 
 References
 **********

boards/nordic_nrf/nrf5340dk/nrf5340dk_nrf5340_cpuapp.yaml

@@ -1,4 +1,4 @@
-identifier: nrf5340dk_nrf5340_cpuapp
+identifier: nrf5340dk/nrf5340/cpuapp
 name: NRF5340-DK-NRF5340-application-MCU
 type: mcu
 arch: arm

boards/nordic_nrf/nrf5340dk/nrf5340dk_nrf5340_cpuapp_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF53X=y
-CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
-CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 

boards/nordic_nrf/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns.yaml

@@ -1,4 +1,4 @@
-identifier: nrf5340dk_nrf5340_cpuapp_ns
+identifier: nrf5340dk/nrf5340/cpuapp/ns
 name: NRF5340-DK-NRF5340-application-MCU-Non-Secure
 type: mcu
 arch: arm

boards/nordic_nrf/nrf5340dk/nrf5340dk_nrf5340_cpuapp_ns_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF53X=y
-CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
-CONFIG_BOARD_NRF5340DK_NRF5340_CPUAPP_NS=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 

boards/nordic_nrf/nrf5340dk/nrf5340dk_nrf5340_cpunet.yaml

@@ -1,4 +1,4 @@
-identifier: nrf5340dk_nrf5340_cpunet
+identifier: nrf5340dk/nrf5340/cpunet
 name: NRF5340-DK-NRF5340-network-MCU
 type: mcu
 arch: arm

boards/nordic_nrf/nrf5340dk/nrf5340dk_nrf5340_cpunet_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF53X=y
-CONFIG_SOC_NRF5340_CPUNET_QKAA=y
-CONFIG_BOARD_NRF5340DK_NRF5340_CPUNET=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y