boards: arm: nrf9131ek_nrf9131: Convert to v2

Converts the board to hwmv2

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

boards/boards_legacy/arm/nrf9131ek_nrf9131/Kconfig.board

@@ -1,14 +0,0 @@
-# nRF9131-EK board configuration
-
-# Copyright (c) 2023 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
-
-if SOC_NRF9131_LACA
-
-config BOARD_NRF9131EK_NRF9131
-	bool "nRF9131 EK NRF9131"
-
-config BOARD_NRF9131EK_NRF9131_NS
-	bool "nRF9131 EK NRF9131 non-secure"
-
-endif # SOC_NRF9131_LACA

boards/nordic_nrf/nrf9131ek/Kconfig.defconfig

@@ -5,9 +5,6 @@
 
 if BOARD_NRF9131EK_NRF9131 || BOARD_NRF9131EK_NRF9131_NS
 
-config BOARD
-	default "nrf9131ek_nrf9131"
-
 # 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/nrf9131ek/Kconfig.nrf9131ek

@@ -0,0 +1,7 @@
+# nRF9131-EK board configuration
+
+# Copyright (c) 2023 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF9131EK
+	select SOC_NRF9131_LACA

boards/nordic_nrf/nrf9131ek/board.yml

@@ -0,0 +1,7 @@
+board:
+  name: nrf9131ek
+  vendor: Nordic Semiconductor
+  socs:
+  - name: nrf9131
+    variants:
+    - name: 'ns'

boards/nordic_nrf/nrf9131ek/doc/index.rst

@@ -8,7 +8,7 @@ Overview
 
 The nRF9131 EK (PCA10165) is a single-board evaluation kit for the nRF9131 SiP
 for DECT NR+ and LTE-M/NB-IoT with GNSS.
-The nrf9131ek_nrf9131 board configuration provides support for the Nordic Semiconductor nRF9131 ARM
+The ``nrf9131ek/nrf9131`` board configuration provides support for the Nordic Semiconductor nRF9131 ARM
 Cortex-M33F CPU with ARMv8-M Security Extension and the following devices:
 
 * :abbr:`ADC (Analog to Digital Converter)`
@@ -46,7 +46,7 @@ is 32 MHz.
 Supported Features
 ==================
 
-The nrf9131ek_nrf9131 board configuration supports the following
+The ``nrf9131ek/nrf9131`` board configuration supports the following
 hardware features:
 
 +-----------+------------+----------------------+
@@ -110,7 +110,7 @@ Security components
 Programming and Debugging
 *************************
 
-nrf9131ek_nrf9131 supports the Armv8m Security Extension, and by default boots
+``nrf9131ek/nrf9131`` supports the Armv8m Security Extension, and by default boots
 in the Secure state.
 
 Building Secure/Non-Secure Zephyr applications with Arm |reg| TrustZone |reg|
@@ -130,9 +130,9 @@ Building the Secure firmware using Zephyr
 
 The process requires the following steps:
 
-1. Build the Secure Zephyr application using ``-DBOARD=nrf9131ek_nrf9131`` and
+1. Build the Secure Zephyr application using ``-DBOARD=nrf9131ek/nrf9131`` and
    ``CONFIG_TRUSTED_EXECUTION_SECURE=y`` in the application project configuration file.
-2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9131ek_nrf9131_ns``.
+2. Build the Non-Secure Zephyr application using ``-DBOARD=nrf9131ek/nrf9131/ns``.
 3. Merge the two binaries together.
 
 Building the Secure firmware with TF-M
@@ -142,7 +142,7 @@ The process to build the Secure firmware image using TF-M and the Non-Secure
 firmware image using Zephyr requires the following action:
 
 1. Build the Non-Secure Zephyr application
-   using ``-DBOARD=nrf9131ek_nrf9131_ns``.
+   using ``-DBOARD=nrf9131ek/nrf9131/ns``.
    To invoke the building of TF-M the Zephyr build system requires the
    Kconfig option ``BUILD_WITH_TFM`` to be enabled, which is done by
    default when building Zephyr as a Non-Secure application.
@@ -168,7 +168,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=nrf9131ek_nrf9131``.
+and :ref:`application_run`), using ``-DBOARD=nrf9131ek/nrf9131``.
 
 
 Flashing
@@ -195,7 +195,7 @@ Then build and flash the application in the usual way.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: nrf9131ek_nrf9131
+   :board: nrf9131ek/nrf9131
    :goals: build flash
 
 Debugging
@@ -216,7 +216,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/nrf9131ek_nrf9131/nrf9131ek_nrf9131_common.dtsi`.
+:zephyr_file:`boards/nordic_nrf/nrf9131ek/nrf9131ek_nrf9131_common.dtsi`.
 
 References
 **********

boards/nordic_nrf/nrf9131ek/nrf9131ek_nrf9131.yaml

@@ -1,4 +1,4 @@
-identifier: nrf9131ek_nrf9131
+identifier: nrf9131ek/nrf9131
 name: nRF9131-EK-NRF9131
 type: mcu
 arch: arm

boards/nordic_nrf/nrf9131ek/nrf9131ek_nrf9131_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9131_LACA=y
-CONFIG_BOARD_NRF9131EK_NRF9131=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -13,13 +9,13 @@ CONFIG_HW_STACK_PROTECTION=y
 # Enable TrustZone-M
 CONFIG_ARM_TRUSTZONE_M=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/nrf9131ek/nrf9131ek_nrf9131_ns.yaml

@@ -1,4 +1,4 @@
-identifier: nrf9131ek_nrf9131_ns
+identifier: nrf9131ek/nrf9131/ns
 name: nRF9131-EK-NRF9131-Non-Secure
 type: mcu
 arch: arm

boards/nordic_nrf/nrf9131ek/nrf9131ek_nrf9131_ns_defconfig

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_NRF91X=y
-CONFIG_SOC_NRF9131_LACA=y
-CONFIG_BOARD_NRF9131EK_NRF9131_NS=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y
 
@@ -16,19 +12,19 @@ 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
 
 CONFIG_PINCTRL=y
 
-# enable PMIC
+# Enable PMIC
 CONFIG_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_SENSOR=y