boards: arm: nrf9161dk_nrf9161: Convert to v2

Converts the board to hwmv2

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

boards/boards_legacy/arm/nrf9161dk_nrf9161/Kconfig.board

@@ -1,14 +0,0 @@
-# nRF9161 DK NRF9161 board configuration
-
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF9161_LACA
-
-config BOARD_NRF9161DK_NRF9161
-	bool "nRF9161 DK NRF9161"
-
-config BOARD_NRF9161DK_NRF9161_NS
-	bool "nRF9161 DK NRF9161 non-secure"
-
-endif # SOC_NRF9161_LACA

boards/boards_legacy/arm/nrf9161dk_nrf9161/revision.cmake

@@ -1,8 +0,0 @@
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-board_check_revision(
-  FORMAT MAJOR.MINOR.PATCH
-  DEFAULT_REVISION 0.9.0
-  VALID_REVISIONS 0.7.0 0.9.0
-)

boards/nordic_nrf/nrf9161dk/Kconfig.defconfig

@@ -5,9 +5,6 @@
 
 if BOARD_NRF9161DK_NRF9161 || BOARD_NRF9161DK_NRF9161_NS
 
-config BOARD
-	default "nrf9161dk_nrf9161"
-
 # For the secure version of the board the firmware is linked at the beginning
 # of the flash, or into the code-partition defined in DT if it is intended to
 # be loaded by MCUboot. If the secure firmware is to be combined with a non-

boards/nordic_nrf/nrf9161dk/Kconfig.nrf9161dk

@@ -0,0 +1,7 @@
+# nRF9161 DK NRF9161 board configuration
+
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF9161DK
+	select SOC_NRF9161_LACA

boards/nordic_nrf/nrf9161dk/board.yml

@@ -0,0 +1,13 @@
+board:
+  name: nrf9161dk
+  vendor: Nordic Semiconductor
+  socs:
+  - name: nrf9161
+    variants:
+    - name: 'ns'
+  revision:
+    format: major.minor.patch
+    default: "0.9.0"
+    revisions:
+    - name: "0.7.0"
+    - name: "0.9.0"

boards/nordic_nrf/nrf9161dk/doc/index.rst

@@ -7,7 +7,7 @@ Overview
 ********
 
 The nRF9161 DK (PCA10153) is a single-board development kit for evaluation and
-development on the nRF9161 SiP for DECT NR+ and LTE-M/NB-IoT with GNSS. The nrf9161dk_nrf9161
+development on the nRF9161 SiP for DECT NR+ and LTE-M/NB-IoT with GNSS. The ``nrf9161dk/nrf9161``
 board configuration provides support for the Nordic Semiconductor nRF9161 ARM
 Cortex-M33F CPU with ARMv8-M Security Extension and the following devices:
 
@@ -41,7 +41,7 @@ is 32 MHz.
 Supported Features
 ==================
 
-The nrf9161dk_nrf9161 board configuration supports the following
+The ``nrf9161dk/nrf9161`` board configuration supports the following
 hardware features:
 
 +-----------+------------+----------------------+
@@ -120,7 +120,7 @@ Security components
 Programming and Debugging
 *************************
 
-nrf9161dk_nrf9161 supports the Armv8m Security Extension, and by default boots
+``nrf9161dk/nrf9161`` supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
 Building Secure/Non-Secure Zephyr applications with Arm |reg| TrustZone |reg|
@@ -128,9 +128,9 @@ Building Secure/Non-Secure Zephyr applications with Arm |reg| TrustZone |reg|
 
 The process requires the following steps:
 
-1. Build the Secure Zephyr application using ``-DBOARD=nrf9161dk_nrf9161`` and
+1. Build the Secure Zephyr application using ``-DBOARD=nrf9161dk/nrf9161`` and
    ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application project configuration file.
-2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9161dk_nrf9161_ns``.
+2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9161dk/nrf9161/ns``.
 3. Merge the two binaries together.
 
 When building a Secure/Non-Secure application, the Secure application will
@@ -142,7 +142,7 @@ Building a Secure only application
 ==================================
 
 Build the Zephyr app in the usual way (see :ref:`build_an_application`
-and :ref:`application_run`), using ``-DBOARD=nrf9161dk_nrf9161``.
+and :ref:`application_run`), using ``-DBOARD=nrf9161dk/nrf9161``.
 
 Flashing
 ========
@@ -168,7 +168,7 @@ Then build and flash the application in the usual way.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: nrf9161dk_nrf9161
+   :board: nrf9161dk/nrf9161
    :goals: build flash
 
 Debugging
@@ -189,7 +189,7 @@ 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/nrf9161dk_nrf9161/nrf9161dk_nrf9161_common.dtsi`.
+:zephyr_file:`boards/nordic_nrf/nrf9161dk/nrf9161dk_nrf9161_common.dtsi`.
 
 References
 **********

boards/nordic_nrf/nrf9161dk/nrf9161dk_nrf9161.yaml

@@ -1,4 +1,4 @@
-identifier: nrf9161dk_nrf9161
+identifier: nrf9161dk/nrf9161
 name: nRF9161-DK-NRF9161
 type: mcu
 arch: arm

boards/nordic_nrf/nrf9161dk/nrf9161dk_nrf9161_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9161_LACA=y
-CONFIG_BOARD_NRF9161DK_NRF9161_NS=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -13,15 +9,12 @@ 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
+# 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/nordic_nrf/nrf9161dk/nrf9161dk_nrf9161_ns.yaml

@@ -1,4 +1,4 @@
-identifier: nrf9161dk_nrf9161_ns
+identifier: nrf9161dk/nrf9161/ns
 name: nRF9161-DK-NRF9161-Non-Secure
 type: mcu
 arch: arm

boards/nordic_nrf/nrf9161dk/nrf9161dk_nrf9161_ns_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9161_LACA=y
-CONFIG_BOARD_NRF9161DK_NRF9161=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