From 0bd932bf3e3d49b3fb2a6869579dcf0d4d3f030a Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Wed, 7 Feb 2024 16:49:12 +0100 Subject: [PATCH] soc: stm32l5: Update stm32l5 non secure targets in various places Need to update board name scheme for L5 ns targets. Signed-off-by: Erwan Gouriou --- doc/services/tfm/requirements.rst | 4 ++-- modules/trusted-firmware-m/Kconfig.tfm | 2 +- samples/subsys/usb/dfu/sample.yaml | 2 +- samples/tfm_integration/psa_crypto/sample.yaml | 2 +- samples/tfm_integration/tfm_ipc/README.rst | 2 +- samples/tfm_integration/tfm_ipc/sample.yaml | 4 ++-- tests/arch/arm/arm_thread_swap_tz/testcase.yaml | 4 ++-- tests/drivers/flash/common/testcase.yaml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/services/tfm/requirements.rst b/doc/services/tfm/requirements.rst index 58f573821e43bbd..7110139bda5bc46 100644 --- a/doc/services/tfm/requirements.rst +++ b/doc/services/tfm/requirements.rst @@ -23,9 +23,9 @@ The following are some of the boards that can be used with TF-M: * - :ref:`b_u585i_iot02a_board` - ``b_u585i_iot02a_ns`` * - :ref:`nucleo_l552ze_q_board` - - ``nucleo_l552ze_q_ns`` + - ``nucleo_l552ze_q/stm32l552xx/ns`` * - :ref:`stm32l562e_dk_board` - - ``stm32l562e_dk_ns`` + - ``stm32l562e_dk/stm32l562xx/ns`` * - :ref:`v2m_musca_b1_board` - ``v2m_musca_b1_ns`` * - :ref:`v2m_musca_s1_board` diff --git a/modules/trusted-firmware-m/Kconfig.tfm b/modules/trusted-firmware-m/Kconfig.tfm index 277dd8a8d09cbe5..d687f0c3eeaa0a9 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm +++ b/modules/trusted-firmware-m/Kconfig.tfm @@ -13,7 +13,7 @@ config TFM_BOARD default "arm/mps2/an521" if BOARD_MPS2_AN521_CPU0_NS default "arm/mps3/an547" if BOARD_MPS3_AN547 default "stm/b_u585i_iot02a" if BOARD_B_U585I_IOT02A - default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q + default "stm/nucleo_l552ze_q" if BOARD_NUCLEO_L552ZE_Q_STM32L552XX_NS default "stm/stm32l562e_dk" if BOARD_STM32L562E_DK default "arm/musca_b1" if BOARD_MUSCA_B1 default "arm/musca_s1" if BOARD_MUSCA_S1 diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml index f74c6327c86b2b7..b1befddb016a1c1 100644 --- a/samples/subsys/usb/dfu/sample.yaml +++ b/samples/subsys/usb/dfu/sample.yaml @@ -19,7 +19,7 @@ common: - b_u585i_iot02a - frdm_kl25z - lpcxpresso55s69_cpu0 - - stm32l562e_dk_ns + - stm32l562e_dk/stm32l562xx/ns depends_on: usb_device filter: dt_label_with_parent_compat_enabled("slot0_partition", "fixed-partitions") and dt_label_with_parent_compat_enabled("slot1_partition", "fixed-partitions") diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml index 45c9940b02165b2..01c059cb13393b2 100644 --- a/samples/tfm_integration/psa_crypto/sample.yaml +++ b/samples/tfm_integration/psa_crypto/sample.yaml @@ -13,7 +13,7 @@ tests: - mcuboot platform_allow: mps2_an521_ns v2m_musca_s1_ns nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns - stm32l562e_dk_ns bl5340_dvk_cpuapp_ns + stm32l562e_dk/stm32l562xx/ns bl5340_dvk_cpuapp_ns harness: console harness_config: type: multi_line diff --git a/samples/tfm_integration/tfm_ipc/README.rst b/samples/tfm_integration/tfm_ipc/README.rst index dc5233c7fc5efb1..4354d36634664ff 100644 --- a/samples/tfm_integration/tfm_ipc/README.rst +++ b/samples/tfm_integration/tfm_ipc/README.rst @@ -118,7 +118,7 @@ Build Zephyr with a non-secure configuration: .. 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/ Example, for building non-secure configuration for STM32L562E-DK Discovery diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml index 4537b5c48dce29a..d03e3df2d3cc15f 100644 --- a/samples/tfm_integration/tfm_ipc/sample.yaml +++ b/samples/tfm_integration/tfm_ipc/sample.yaml @@ -12,8 +12,8 @@ tests: - mps2_an521_ns - nrf5340dk_nrf5340_cpuapp_ns - nrf9160dk_nrf9160_ns - - nucleo_l552ze_q_ns - - stm32l562e_dk_ns + - nucleo_l552ze_q/stm32l552xx/ns + - stm32l562e_dk/stm32l562xx/ns - v2m_musca_s1_ns - bl5340_dvk_cpuapp_ns - b_u585i_iot02a_ns diff --git a/tests/arch/arm/arm_thread_swap_tz/testcase.yaml b/tests/arch/arm/arm_thread_swap_tz/testcase.yaml index d12173451b118f4..fc488884b287e13 100644 --- a/tests/arch/arm/arm_thread_swap_tz/testcase.yaml +++ b/tests/arch/arm/arm_thread_swap_tz/testcase.yaml @@ -10,7 +10,7 @@ tests: # NOTE: this platform disables FPU access in TFM. platform_exclude: - mps3/an547/ns - - nucleo_l552ze_q_ns + - nucleo_l552ze_q/stm32l552xx/ns integration_platforms: - mps2_an521_ns arch.arm.swap.tz_off: @@ -19,6 +19,6 @@ tests: # NOTE: this platform disables FPU access in TFM. platform_exclude: - mps3/an547/ns - - nucleo_l552ze_q_ns + - nucleo_l552ze_q/stm32l552xx/ns integration_platforms: - mps2_an521_ns diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml index e0caddbd7739bd2..b7f20ea82bcbf42 100644 --- a/tests/drivers/flash/common/testcase.yaml +++ b/tests/drivers/flash/common/testcase.yaml @@ -56,7 +56,7 @@ tests: - nucleo_wb55rg - nucleo_wl55jc - stm32l562e_dk - - stm32l562e_dk_ns + - stm32l562e_dk/stm32l562xx/ns integration_platforms: - nucleo_f103rb filter: (dt_compat_enabled("st,stm32-flash-controller") or