boards: arm: raytac_mdbt53v_db_40_nrf5340: Convert to v2

Converts the board to hwmv2

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

boards/boards_legacy/arm/raytac_mdbt53v_db_40_nrf5340/CMakeLists.txt

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-if ((CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP OR CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS)
-    AND CONFIG_BOARD_ENABLE_CPUNET)
-  zephyr_library()
-  zephyr_library_sources(raytac_mdbt53v_db_40_nrf5340_cpunet_reset.c)
-endif()

boards/boards_legacy/arm/raytac_mdbt53v_db_40_nrf5340/Kconfig.board

@@ -1,18 +0,0 @@
-# Raytac MDBT53-DB-40 NRF5340 board configuration
-
-# Copyright (c) 2019-2020 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF5340_CPUAPP_QKAA
-
-config BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP
-	bool "Raytac MDBT53V-DB-40 nRF5340 Application MCU"
-
-config BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
-	bool "Raytac MDBT53V-DB-40 nRF5340 Application MCU non-secure"
-
-endif # SOC_NRF5340_CPUAPP_QKAA
-
-config BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET
-	bool "Raytac MDBT53V-DB-40 NRF5340 Network MCU"
-	depends on SOC_NRF5340_CPUNET_QKAA

boards/boards_legacy/arm/raytac_mdbt53v_db_40_nrf5340/raytac_mdbt53v_db_40_nrf5340_cpuapp_ns_defconfig

@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-CONFIG_SOC_SERIES_NRF53X=y
-CONFIG_SOC_NRF5340_CPUAPP_QKAA=y
-CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS=y
-
-# Enable MPU
-CONFIG_ARM_MPU=y
-
-# Enable hardware stack protection
-CONFIG_HW_STACK_PROTECTION=y
-
-# Enable TrustZone-M
-CONFIG_ARM_TRUSTZONE_M=y
-
-# This Board implies building Non-Secure firmware
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# Enable uart driver
-CONFIG_SERIAL=y
-
-# enable console
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y

boards/raytac/raytac_mdbt53v_db_40/CMakeLists.txt

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if((CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP OR CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS)
+   AND CONFIG_BOARD_ENABLE_CPUNET)
+  zephyr_library()
+  zephyr_library_sources(raytac_mdbt53v_db_40_nrf5340_cpunet_reset.c)
+endif()

boards/raytac/raytac_mdbt53v_db_40/Kconfig

@@ -38,7 +38,7 @@ config BOARD_ENABLE_CPUNET
 
 config DOMAIN_CPUNET_BOARD
 	string
-	default "raytac_mdbt53v_db_40_nrf5340_cpunet"
+	default "raytac_mdbt53v_db_40/nrf5340/cpunet"
 	depends on BOARD_ENABLE_CPUNET
 	help
 	  The board which will be used for CPUNET domain when creating a multi
@@ -46,13 +46,16 @@ config DOMAIN_CPUNET_BOARD
 	  another board. For example hci_ipc on the nRF5340_cpunet for
 	  Bluetooth applications.
 
-endif #  BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
+endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
+
+if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET
 
 config DOMAIN_CPUAPP_BOARD
 	string
-	default "raytac_mdbt53v_db_40_nrf5340_cpuapp"
-	depends on BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET
+	default "raytac_mdbt53v_db_40/nrf5340/cpuapp"
 	help
 	  The board which will be used for CPUAPP domain when creating a multi
 	  image application where one or more images should be located on
 	  another board.
+
+endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET

boards/raytac/raytac_mdbt53v_db_40/Kconfig.defconfig

@@ -3,10 +3,7 @@
 # Copyright (c) 2019-2020 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-if  BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
-
-config BOARD
-	default "raytac_mdbt53v_db_40_nrf5340_cpuapp" if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
+if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
 
 # Code Partition:
 #
@@ -56,19 +53,6 @@ config FLASH_LOAD_SIZE
 
 endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
 
-endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
-
-config BOARD
-	default "raytac_mdbt53v_dv_40_nrf5340_cpunet" if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET
-
-config IPM_NRFX
-	default IPM
-
-config MBOX_NRFX_IPC
-	default MBOX
-
-if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
-
 choice BT_HCI_BUS_TYPE
 	default BT_HCI_IPC if BT
 endchoice
@@ -77,7 +61,13 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int
 	default 4096 if BT_HCI_IPC
 
-endif #  BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
+endif # BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP || BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
+
+config IPM_NRFX
+	default IPM
+
+config MBOX_NRFX_IPC
+	default MBOX
 
 if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET
 

boards/raytac/raytac_mdbt53v_db_40/Kconfig.raytac_mdbt53v_db_40

@@ -0,0 +1,9 @@
+# Raytac MDBT53-DB-40 NRF5340 board configuration
+
+# Copyright (c) 2019-2020 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_RAYTAC_MDBT53V_DB_40
+	select SOC_NRF5340_CPUAPP_QKAA if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP
+	select SOC_NRF5340_CPUAPP_QKAA if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS
+	select SOC_NRF5340_CPUNET_QKAA if BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET

boards/raytac/raytac_mdbt53v_db_40/board.cmake

@@ -2,11 +2,10 @@
 
 if(CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP OR CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP_NS)
   board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
-endif()
-
-if(CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET)
+elseif(BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET)
   board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
 endif()
 
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/raytac/raytac_mdbt53v_db_40/board.yml

@@ -0,0 +1,8 @@
+board:
+  name: raytac_mdbt53v_db_40
+  vendor: Raytac Corporation
+  socs:
+  - name: 'nrf5340'
+    variants:
+    - name: 'ns'
+      cpucluster: 'cpuapp'

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp.yaml

@@ -1,4 +1,4 @@
-identifier: raytac_mdbt53v_db_40_nrf5340_cpuapp
+identifier: raytac_mdbt53v_db_40/nrf5340/cpuapp
 name: RAYTAC-MDBT53V-DB-40-NRF5340-application-MCU
 type: mcu
 arch: arm

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_defconfig

@@ -1,21 +1,20 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF53X=y
-CONFIG_SOC_NRF5340_CPUNET_QKAA=y
-CONFIG_BOARD_RAYTAC_MDBT53V_DB_40_NRF5340_CPUNET=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
 # Enable hardware stack protection
 CONFIG_HW_STACK_PROTECTION=y
 
-# enable GPIO
+# Enable TrustZone-M
+CONFIG_ARM_TRUSTZONE_M=y
+
+# Enable GPIO
 CONFIG_GPIO=y
 
-# Enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpuapp_ns.yaml

@@ -1,4 +1,4 @@
-identifier: raytac_mdbt53v_db_40_nrf5340_cpuapp_ns
+identifier: raytac_mdbt53v_db_40/nrf5340/cpuapp/ns
 name: RAYTAC-MDBT53V-DB-40-NRF52840-application-MCU-Non-Secure
 type: mcu
 arch: arm

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_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_RAYTAC_MDBT53V_DB_40_NRF5340_CPUAPP=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -13,12 +9,15 @@ CONFIG_HW_STACK_PROTECTION=y
 # Enable TrustZone-M
 CONFIG_ARM_TRUSTZONE_M=y
 
-# enable GPIO
+# This board implies building Non-Secure firmware
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y
+
+# Enable GPIO
 CONFIG_GPIO=y
 
-# Enable uart driver
+# Enable UART driver
 CONFIG_SERIAL=y
 
-# enable console
+# Enable console
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet.yaml

@@ -2,7 +2,7 @@
 
 # Copyright (c) 2023 Raytac Corporation
 # SPDX-License-Identifier: Apache-2.0
-identifier: raytac_mdbt53v_db_40_nrf5340_cpunet
+identifier: raytac_mdbt53v_db_40/nrf5340/cpunet
 name: RAYTAC MDBT53V-DB-40-NRF5340-network-MCU
 type: mcu
 arch: arm

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_defconfig

@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# Enable MPU
+CONFIG_ARM_MPU=y
+
+# Enable hardware stack protection
+CONFIG_HW_STACK_PROTECTION=y
+
+# Enable GPIO
+CONFIG_GPIO=y
+
+# Enable UART driver
+CONFIG_SERIAL=y
+
+# Enable console
+CONFIG_CONSOLE=y
+CONFIG_UART_CONSOLE=y

boards/raytac/raytac_mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_defconfig

@@ -0,0 +1 @@
+# SPDX-License-Identifier: Apache-2.0