From 15e8f635d89cfef923e49f87aa0dd492c0e9e5b9 Mon Sep 17 00:00:00 2001 From: Kevin Townsend Date: Wed, 7 Jul 2021 11:30:21 +0200 Subject: [PATCH] boards: arm: v2m_musca_s1: Rename NS target This commit update the NS board variant from `v2m_musca_s1_nonsecure` to `v2m_musca_s1_ns` to maintain consistency across zephyr. Signed-off-by: Kevin Townsend --- boards/arm/v2m_musca_s1/Kconfig.defconfig | 2 +- boards/arm/v2m_musca_s1/doc/index.rst | 4 ++-- .../{v2m_musca_s1_nonsecure.dts => v2m_musca_s1_ns.dts} | 0 .../{v2m_musca_s1_nonsecure.yaml => v2m_musca_s1_ns.yaml} | 2 +- ...musca_s1_nonsecure_defconfig => v2m_musca_s1_ns_defconfig} | 0 samples/tfm_integration/psa_crypto/sample.yaml | 2 +- samples/tfm_integration/psa_protected_storage/sample.yaml | 2 +- samples/tfm_integration/tfm_ipc/sample.yaml | 2 +- samples/tfm_integration/tfm_psa_test/sample.yaml | 2 +- samples/tfm_integration/tfm_regression_test/sample.yaml | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename boards/arm/v2m_musca_s1/{v2m_musca_s1_nonsecure.dts => v2m_musca_s1_ns.dts} (100%) rename boards/arm/v2m_musca_s1/{v2m_musca_s1_nonsecure.yaml => v2m_musca_s1_ns.yaml} (77%) rename boards/arm/v2m_musca_s1/{v2m_musca_s1_nonsecure_defconfig => v2m_musca_s1_ns_defconfig} (100%) diff --git a/boards/arm/v2m_musca_s1/Kconfig.defconfig b/boards/arm/v2m_musca_s1/Kconfig.defconfig index a7b6141c589..1516597b6d1 100644 --- a/boards/arm/v2m_musca_s1/Kconfig.defconfig +++ b/boards/arm/v2m_musca_s1/Kconfig.defconfig @@ -5,7 +5,7 @@ if BOARD_MUSCA_S1 config BOARD default "musca_s1" if TRUSTED_EXECUTION_SECURE || !TRUSTED_EXECUTION_NONSECURE - default "musca_s1_nonsecure" + default "musca_s1_ns" if GPIO diff --git a/boards/arm/v2m_musca_s1/doc/index.rst b/boards/arm/v2m_musca_s1/doc/index.rst index c67cf5f6d5c..5f06b3eaa91 100644 --- a/boards/arm/v2m_musca_s1/doc/index.rst +++ b/boards/arm/v2m_musca_s1/doc/index.rst @@ -388,13 +388,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_nonsecure`` +The TF-M integration samples can be run using the ``v2m_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_nonsecure + :board: v2m_musca_s1_ns :goals: build To upload the build artifact to the board, first connect the Musca-S1 to your diff --git a/boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure.dts b/boards/arm/v2m_musca_s1/v2m_musca_s1_ns.dts similarity index 100% rename from boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure.dts rename to boards/arm/v2m_musca_s1/v2m_musca_s1_ns.dts diff --git a/boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure.yaml b/boards/arm/v2m_musca_s1/v2m_musca_s1_ns.yaml similarity index 77% rename from boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure.yaml rename to boards/arm/v2m_musca_s1/v2m_musca_s1_ns.yaml index 4b4ff149572..e70129e968e 100644 --- a/boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure.yaml +++ b/boards/arm/v2m_musca_s1/v2m_musca_s1_ns.yaml @@ -1,4 +1,4 @@ -identifier: v2m_musca_s1_nonsecure +identifier: v2m_musca_s1_ns name: ARM V2M MUSCA-S1 NonSecure type: mcu arch: arm diff --git a/boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure_defconfig b/boards/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig similarity index 100% rename from boards/arm/v2m_musca_s1/v2m_musca_s1_nonsecure_defconfig rename to boards/arm/v2m_musca_s1/v2m_musca_s1_ns_defconfig diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml index 47507efbdca..9e4f2398a72 100644 --- a/samples/tfm_integration/psa_crypto/sample.yaml +++ b/samples/tfm_integration/psa_crypto/sample.yaml @@ -6,7 +6,7 @@ tests: sample.psa_crypto: tags: introduction tfm crypto platform_allow: mps2_an521_ns lpcxpresso55s69_ns nrf5340dk_nrf5340_cpuappns - nrf9160dk_nrf9160ns nucleo_l552ze_q_ns v2m_musca_s1_nonsecure stm32l562e_dk_ns + nrf9160dk_nrf9160ns nucleo_l552ze_q_ns v2m_musca_s1_ns stm32l562e_dk_ns bl5340_dvk_cpuapp_ns harness: console harness_config: diff --git a/samples/tfm_integration/psa_protected_storage/sample.yaml b/samples/tfm_integration/psa_protected_storage/sample.yaml index 05c2a178ade..e212106d1bf 100644 --- a/samples/tfm_integration/psa_protected_storage/sample.yaml +++ b/samples/tfm_integration/psa_protected_storage/sample.yaml @@ -3,7 +3,7 @@ sample: name: PSA Protected Storage common: tags: psa - platform_allow: mps2_an521_ns v2m_musca_s1_nonsecure + platform_allow: mps2_an521_ns v2m_musca_s1_ns nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns bl5340_dvk_cpuapp_ns harness: console harness_config: diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml index b2ec171c514..eab28a91b5b 100644 --- a/samples/tfm_integration/tfm_ipc/sample.yaml +++ b/samples/tfm_integration/tfm_ipc/sample.yaml @@ -7,7 +7,7 @@ tests: tags: introduction tfm platform_allow: mps2_an521_ns lpcxpresso55s69_ns nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns nucleo_l552ze_q_ns - stm32l562e_dk_ns v2m_musca_s1_nonsecure v2m_musca_b1_ns bl5340_dvk_cpuapp_ns + stm32l562e_dk_ns v2m_musca_s1_ns v2m_musca_b1_ns bl5340_dvk_cpuapp_ns harness: console harness_config: type: multi_line diff --git a/samples/tfm_integration/tfm_psa_test/sample.yaml b/samples/tfm_integration/tfm_psa_test/sample.yaml index ecfae272b47..d0f34821910 100644 --- a/samples/tfm_integration/tfm_psa_test/sample.yaml +++ b/samples/tfm_integration/tfm_psa_test/sample.yaml @@ -2,7 +2,7 @@ common: tags: tfm platform_allow: mps2_an521_ns nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns - v2m_musca_s1_nonsecure + v2m_musca_s1_ns harness: console harness_config: type: multi_line diff --git a/samples/tfm_integration/tfm_regression_test/sample.yaml b/samples/tfm_integration/tfm_regression_test/sample.yaml index 6d844e78088..b681ee518b4 100644 --- a/samples/tfm_integration/tfm_regression_test/sample.yaml +++ b/samples/tfm_integration/tfm_regression_test/sample.yaml @@ -2,7 +2,7 @@ common: tags: tfm platform_allow: lpcxpresso55s69_ns mps2_an521_ns nrf5340dk_nrf5340_cpuappns nrf9160dk_nrf9160ns - v2m_musca_s1_nonsecure + v2m_musca_s1_ns harness: console harness_config: type: multi_line