boards: Convert stm32l562e_dk to HWM v2

Port the board to HWMv2. Signed-off-by: Erwan Gouriou <[email protected]>
zephyrproject-rtos · Feb 7, 2024 · 18259d9 · 18259d9
1 parent 2c29827
commit 18259d9
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 29 deletions.
diff --git a/boards/boards_legacy/arm/stm32l562e_dk/Kconfig.board b/boards/boards_legacy/arm/stm32l562e_dk/Kconfig.board
diff --git a/...s_legacy/arm/stm32l562e_dk/CMakeLists.txt → boards/st/stm32l562e_dk/CMakeLists.txt b/...s_legacy/arm/stm32l562e_dk/CMakeLists.txt → boards/st/stm32l562e_dk/CMakeLists.txt
diff --git a/...egacy/arm/stm32l562e_dk/Kconfig.defconfig → boards/st/stm32l562e_dk/Kconfig.defconfig b/...egacy/arm/stm32l562e_dk/Kconfig.defconfig → boards/st/stm32l562e_dk/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_STM32L562E_DK
 
-config BOARD
-	default "stm32l562e_dk"
-
 if BT
 
 config SPI
@@ -29,6 +26,10 @@ config BT_HCI_VS_EXT
 
 endif # BT
 
+endif # BOARD_STM32L562E_DK
+
+if BOARD_STM32L562E_DK_STM32L562XX_NS
+
 if TRUSTED_EXECUTION_NONSECURE
 
 # Get flash configuration for NS image from dts flash partition
@@ -37,4 +38,4 @@ config USE_DT_CODE_PARTITION
 
 endif # TRUSTED_EXECUTION_NONSECURE
 
-endif # BOARD_STM32L562E_DK
+endif # BOARD_STM32L562E_DK_STM32L562XX_NS
diff --git a/boards/st/stm32l562e_dk/Kconfig.stm32l562e_dk b/boards/st/stm32l562e_dk/Kconfig.stm32l562e_dk
@@ -0,0 +1,9 @@
+# Copyright (c) 2020 Yestin Sun
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_STM32L562E_DK
+	select SOC_STM32L562XX
+
+config BOARD_STM32L562E_DK_STM32L562XX_NS
+	bool
+	select SOC_STM32L562XX
diff --git a/...m/stm32l562e_dk/arduino_r3_connector.dtsi → ...t/stm32l562e_dk/arduino_r3_connector.dtsi b/...m/stm32l562e_dk/arduino_r3_connector.dtsi → ...t/stm32l562e_dk/arduino_r3_connector.dtsi
diff --git a/...ards_legacy/arm/stm32l562e_dk/board.cmake → boards/st/stm32l562e_dk/board.cmake b/...ards_legacy/arm/stm32l562e_dk/board.cmake → boards/st/stm32l562e_dk/board.cmake
diff --git a/boards/st/stm32l562e_dk/board.yml b/boards/st/stm32l562e_dk/board.yml
@@ -0,0 +1,7 @@
+board:
+  name: stm32l562e_dk
+  vendor: st
+  socs:
+    - name: stm32l562xx
+      variants:
+      - name: ns
diff --git a/...m/stm32l562e_dk/doc/img/stm32l562e_dk.jpg → ...t/stm32l562e_dk/doc/img/stm32l562e_dk.jpg b/...m/stm32l562e_dk/doc/img/stm32l562e_dk.jpg → ...t/stm32l562e_dk/doc/img/stm32l562e_dk.jpg
diff --git a/...ds_legacy/arm/stm32l562e_dk/doc/index.rst → boards/st/stm32l562e_dk/doc/index.rst b/...ds_legacy/arm/stm32l562e_dk/doc/index.rst → boards/st/stm32l562e_dk/doc/index.rst
@@ -214,20 +214,20 @@ for building for both Secure and Non-Secure firmware.
 
 The BOARD options are summarized below:
 
-+----------------------+-----------------------------------------------+
-|   BOARD              | Description                                   |
-+======================+===============================================+
-| stm32l562e_dk        | For building Secure (or Secure-only) firmware |
-+----------------------+-----------------------------------------------+
-| stm32l562e_dk_ns     | For building Non-Secure firmware              |
-+----------------------+-----------------------------------------------+
++------------------------------+-------------------------------------------+
+| BOARD                        | Description                               |
++==============================+===========================================+
+| stm32l562e_dk                | For building Trust Zone Disabled firmware |
++------------------------------+-------------------------------------------+
+| stm32l562e_dk/stm32l562xx/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 stm32l562e_dk_ns samples/tfm_integration/tfm_ipc/
+      $ west build -b stm32l562e_dk/stm32l562xx/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,
@@ -334,11 +334,11 @@ Building Secure/Non-Secure Zephyr applications with Arm |reg| TrustZone |reg|
 
 The TF-M integration sample :ref:`tfm_ipc` can be run on a ST STM32L562E-DK Discovery.
 In TF-M configuration, Zephyr is run on the non-secure domain. A non-secure image
-can be generated using ``stm32l562e_dk_ns`` as build target.
+can be generated using ``stm32l562e_dk/stm32l562xx/ns`` as build target.
 
 .. code-block:: bash
 
-   $ west build -b stm32l562e_dk_ns path/to/source/directory
+   $ west build -b stm32l562e_dk/stm32l562xx/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.

diff --git a/...egacy/arm/stm32l562e_dk/stm32l562e_dk.dts → boards/st/stm32l562e_dk/stm32l562e_dk.dts b/...egacy/arm/stm32l562e_dk/stm32l562e_dk.dts → boards/st/stm32l562e_dk/stm32l562e_dk.dts
diff --git a/...gacy/arm/stm32l562e_dk/stm32l562e_dk.yaml → boards/st/stm32l562e_dk/stm32l562e_dk.yaml b/...gacy/arm/stm32l562e_dk/stm32l562e_dk.yaml → boards/st/stm32l562e_dk/stm32l562e_dk.yaml
diff --git a/...m/stm32l562e_dk/stm32l562e_dk_common.dtsi → ...t/stm32l562e_dk/stm32l562e_dk_common.dtsi b/...m/stm32l562e_dk/stm32l562e_dk_common.dtsi → ...t/stm32l562e_dk/stm32l562e_dk_common.dtsi
diff --git a/...arm/stm32l562e_dk/stm32l562e_dk_defconfig → .../st/stm32l562e_dk/stm32l562e_dk_defconfig b/...arm/stm32l562e_dk/stm32l562e_dk_defconfig → .../st/stm32l562e_dk/stm32l562e_dk_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32L5X=y
-CONFIG_SOC_STM32L562XX=y
-
 # enable uart driver
 CONFIG_SERIAL=y
 

diff --git a/...cy/arm/stm32l562e_dk/stm32l562e_dk_ns.dts → ...l562e_dk/stm32l562e_dk_stm32l562xx_ns.dts b/...cy/arm/stm32l562e_dk/stm32l562e_dk_ns.dts → ...l562e_dk/stm32l562e_dk_stm32l562xx_ns.dts
diff --git a/...y/arm/stm32l562e_dk/stm32l562e_dk_ns.yaml → ...562e_dk/stm32l562e_dk_stm32l562xx_ns.yaml b/...y/arm/stm32l562e_dk/stm32l562e_dk_ns.yaml → ...562e_dk/stm32l562e_dk_stm32l562xx_ns.yaml
@@ -1,4 +1,4 @@
-identifier: stm32l562e_dk_ns
+identifier: stm32l562e_dk/stm32l562xx/ns
 name: ST STM32L562E-DK Discovery non secure
 type: mcu
 arch: arm

diff --git a/.../stm32l562e_dk/stm32l562e_dk_ns_defconfig → ...dk/stm32l562e_dk_stm32l562xx_ns_defconfig b/.../stm32l562e_dk/stm32l562e_dk_ns_defconfig → ...dk/stm32l562e_dk_stm32l562xx_ns_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32L5X=y
-CONFIG_SOC_STM32L562XX=y
-
 # enable uart driver
 CONFIG_SERIAL=y
 

diff --git a/...acy/arm/stm32l562e_dk/support/openocd.cfg → boards/st/stm32l562e_dk/support/openocd.cfg b/...acy/arm/stm32l562e_dk/support/openocd.cfg → boards/st/stm32l562e_dk/support/openocd.cfg