boards: Convert nucleo_l552ze_q to HWM v2

Port the board to HWMv2.

Signed-off-by: Erwan Gouriou <erwan.gouriou@st.com>

boards/boards_legacy/arm/nucleo_l552ze_q/Kconfig.board

@@ -1,8 +0,0 @@
-# STM32L552ZE Q Nucleo board configuration
-
-# Copyright (c) 2020 Linaro Limited
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_NUCLEO_L552ZE_Q
-	bool "Nucleo L552ZE Q Development Board"
-	depends on SOC_STM32L552XX

boards/st/nucleo_l552ze_q/Kconfig.defconfig

@@ -3,10 +3,7 @@
 # Copyright (c) 2020 Linaro Limited
 # SPDX-License-Identifier: Apache-2.0
 
-if BOARD_NUCLEO_L552ZE_Q
+if BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS
-
-config BOARD
-	default "nucleo_l552ze_q"
 
 if TRUSTED_EXECUTION_NONSECURE
 
@@ -16,4 +13,4 @@ config USE_DT_CODE_PARTITION
 
 endif # TRUSTED_EXECUTION_NONSECURE
 
-endif # BOARD_NUCLEO_L552ZE_Q
+endif # BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS

boards/st/nucleo_l552ze_q/Kconfig.nucleo_l552ze_q

@@ -0,0 +1,9 @@
+# Copyright (c) 2020 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NUCLEO_L552ZE_Q
+	select SOC_STM32L552XX
+
+config BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS
+	bool
+	select SOC_STM32L552XX

boards/st/nucleo_l552ze_q/board.yml

@@ -0,0 +1,7 @@
+board:
+  name: nucleo_l552ze_q
+  vendor: st
+  socs:
+    - name: stm32l552xx
+      variants:
+        - name: ns

boards/st/nucleo_l552ze_q/doc/nucleol552ze_q.rst

@@ -168,17 +168,17 @@ The default configuration can be found in the defconfig and dts files:
 
 - Common:
 
-  - :zephyr_file:`boards/arm/nucleo_l552ze_q/nucleo_l552ze_q-common.dtsi`
+  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q-common.dtsi`
 
 - Secure target:
 
-  - :zephyr_file:`boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_defconfig`
+  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q_defconfig`
-  - :zephyr_file:`boards/arm/nucleo_l552ze_q/nucleo_l552ze_q.dts`
+  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q.dts`
 
 - Non-Secure target:
 
-  - :zephyr_file:`boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_ns_defconfig`
+  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q_stm32l552xx_ns_defconfig`
-  - :zephyr_file:`boards/arm/nucleo_l552ze_q/nucleo_l552ze_q_ns.dts`
+  - :zephyr_file:`boards/st/nucleo_l552ze_q/nucleo_l552ze_q_stm32l552xx_ns.dts`
 
 Zephyr board options
 ====================
@@ -188,20 +188,20 @@ for building for both Secure and Non-Secure firmware.
 
 The BOARD options are summarized below:
 
-+----------------------+-----------------------------------------------+
++--------------------------------+-------------------------------------------+
 | BOARD                          | Description                               |
-+======================+===============================================+
++================================+===========================================+
-| nucleo_l552ze_q      | For building Secure (or Secure-only) firmware |
+| nucleo_l552ze_q                | For building Trust Zone Disabled firmware |
-+----------------------+-----------------------------------------------+
++--------------------------------+-------------------------------------------+
-| nucleo_l552ze_q_ns   | For building Non-Secure firmware              |
+| nucleo_l552ze_q/stm32l552xx/ns | For building Non-Secure firmware          |
-+----------------------+-----------------------------------------------+
++--------------------------------+-------------------------------------------+
 
 Here are the instructions to build Zephyr with a non-secure configuration,
 using `tfm_ipc_` sample:
 
    .. code-block:: bash
 
-      $ west build -b nucleo_l552ze_q_ns samples/tfm_integration/tfm_ipc/
+      $ west build -b nucleo_l552ze_q/stm32l552xx/ns samples/tfm_integration/tfm_ipc/
 
 Once done, before flashing, you need to first run a generated script that
 will set platform option bytes config and erase platform (among others,
@@ -332,11 +332,11 @@ Building a secure/non-secure with Arm |reg| TrustZone |reg|
 
 The TF-M integration sample :ref:`tfm_ipc` can be run on a ST Nucleo L552ZE Q.
 In TF-M configuration, Zephyr is run on the non-secure domain. A non-secure image
-can be generated using ``nucleo_l552ze_q_ns`` as build target.
+can be generated using ``nucleo_l552ze_q/stm32l552xx/ns`` as build target.
 
 .. code-block:: bash
 
-   $ west build -b nucleo_l552ze_q_ns path/to/source/directory
+   $ west build -b nucleo_l552ze_q/stm32l552xx/ns path/to/source/directory
 
 Note: When building the ``*_ns`` image with TF-M, ``build/tfm/api_ns/postbuild.sh`` bash script
 is run automatically in a post-build step to make some required flash layout changes.

boards/st/nucleo_l552ze_q/nucleo_l552ze_q_defconfig

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32L5X=y
-CONFIG_SOC_STM32L552XX=y
-
 # enable uart driver
 CONFIG_SERIAL=y
 

boards/st/nucleo_l552ze_q/nucleo_l552ze_q_stm32l552xx_ns.yaml

@@ -1,4 +1,4 @@
-identifier: nucleo_l552ze_q_ns
+identifier: nucleo_l552ze_q/stm32l552xx/ns
 name: ST Nucleo L552ZE Q non secure
 type: mcu
 arch: arm

boards/st/nucleo_l552ze_q/nucleo_l552ze_q_stm32l552xx_ns_defconfig

@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32L5X=y
-CONFIG_SOC_STM32L552XX=y
-
 # enable uart driver
 CONFIG_SERIAL=y