boards: arm: v2m_musca_s1: Convert to v2

Converts the board to hwmv2

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

boards/arm/v2m_musca_s1/Kconfig.defconfig

@@ -1,11 +1,7 @@
 # Copyright (c) 2019-2020 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_MUSCA_S1
-
-config BOARD
-	default "musca_s1" if TRUSTED_EXECUTION_SECURE || !TRUSTED_EXECUTION_NONSECURE
-	default "musca_s1_ns"
+if BOARD_V2M_MUSCA_S1
 
 if SERIAL
 
@@ -14,4 +10,4 @@ config UART_INTERRUPT_DRIVEN
 
 endif # SERIAL
 
-endif
+endif # BOARD_V2M_MUSCA_S1

boards/arm/v2m_musca_s1/Kconfig.v2m_musca_s1

@@ -0,0 +1,5 @@
+# Copyright (c) 2019-2020 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_V2M_MUSCA_S1
+	select SOC_V2M_MUSCA_S1

boards/arm/v2m_musca_s1/board.yml

@@ -0,0 +1,7 @@
+board:
+  name: v2m_musca_s1
+  vendor: ARM
+  socs:
+  - name: musca_s1
+    variants:
+    - name: 'ns'

boards/arm/v2m_musca_s1/doc/index.rst

@@ -384,13 +384,13 @@ folder after TF-M built.
 Building the TF-M integration sample for Musca-S1
 -------------------------------------------------
 
-The TF-M integration samples can be run using the ``v2m_musca_s1_ns``
+The TF-M integration samples can be run using the ``v2m_musca_s1/musca_s1/ns``
 target. Please make sure all the requirements listed in the sample's
 description are met before building.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/tfm_integration/psa_crypto
-   :board: v2m_musca_s1_ns
+   :board: v2m_musca_s1/musca_s1/ns
    :goals: build
 
 To upload the build artifact to the board, first connect the Musca-S1 to your

boards/arm/v2m_musca_s1/v2m_musca_s1.yaml

@@ -1,4 +1,4 @@
-identifier: v2m_musca_s1
+identifier: v2m_musca_s1/musca_s1
 name: ARM V2M MUSCA-S1
 type: mcu
 arch: arm

boards/arm/v2m_musca_s1/v2m_musca_s1_defconfig

@@ -4,8 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_SOC_SERIES_MUSCA_S1=y
-CONFIG_SOC_V2M_MUSCA_S1=y
 CONFIG_RUNTIME_NMI=y
 CONFIG_ARM_TRUSTZONE_M=y
 CONFIG_ARM_MPU=y

boards/arm/v2m_musca_s1/v2m_musca_s1_musca_s1_ns.yaml

@@ -1,4 +1,4 @@
-identifier: v2m_musca_s1_ns
+identifier: v2m_musca_s1/musca_s1/ns
 name: ARM V2M MUSCA-S1 NonSecure
 type: mcu
 arch: arm

boards/arm/v2m_musca_s1/v2m_musca_s1_musca_s1_ns_defconfig

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2019-2020 Linaro Limited
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+CONFIG_TRUSTED_EXECUTION_NONSECURE=y

boards/boards_legacy/arm/v2m_musca_s1/Kconfig.board

@@ -1,6 +0,0 @@
-# Copyright (c) 2019-2020 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_MUSCA_S1
-	bool "ARM Cortex-M33 SMM on V2M-MUSCA-S1"
-	depends on SOC_SERIES_MUSCA_S1

boards/boards_legacy/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig

@@ -1,17 +0,0 @@
-#
-# Copyright (c) 2019-2020 Linaro Limited
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-CONFIG_SOC_SERIES_MUSCA_S1=y
-CONFIG_SOC_V2M_MUSCA_S1=y
-CONFIG_ARM_TRUSTZONE_M=y
-CONFIG_RUNTIME_NMI=y
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-CONFIG_ARM_MPU=y
-
-# Serial
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_SERIAL=y

modules/trusted-firmware-m/Kconfig.tfm

@@ -16,7 +16,7 @@ config TFM_BOARD
 	default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q
 	default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK
 	default "arm/musca_b1" if BOARD_V2M_MUSCA_B1
-	default "arm/musca_s1" if BOARD_MUSCA_S1
+	default "arm/musca_s1" if BOARD_V2M_MUSCA_S1
 	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic_nrf/nrf9160" if SOC_NRF9160
 	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic_nrf/nrf9120" if SOC_NRF9120
 	default "${ZEPHYR_BASE}/modules/trusted-firmware-m/nordic_nrf/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP