From 5d5c13feaed01d8dc265497c4f7162b841c13e5b Mon Sep 17 00:00:00 2001 From: Wilfried Chauveau Date: Wed, 17 Apr 2024 08:47:51 +0100 Subject: [PATCH] samples: tfm: Remove old 'tfm' tag & update relevant boards The 'tfm' tag was removed from the samples in in 7c80473e0a06851f826f4018af348d04ae57e401 but it remained in use in other parts of the project. This change brings back consistency through out the project. Signed-off-by: Wilfried Chauveau --- MAINTAINERS.yml | 2 +- boards/arm/mps2/mps2_an521_cpu0_ns.yaml | 1 - boards/arm/mps3/mps3_an547_ns.yaml | 2 +- tests/arch/arm/arm_thread_swap_tz/testcase.yaml | 2 +- tests/net/lib/tls_credentials/testcase.yaml | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index e68df60cb58..ee704210bc9 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3877,7 +3877,7 @@ TF-M Integration: labels: - "area: TF-M" tests: - - tfm + - trusted-firmware-m "Toolchain Integration": diff --git a/boards/arm/mps2/mps2_an521_cpu0_ns.yaml b/boards/arm/mps2/mps2_an521_cpu0_ns.yaml index b5dcadf7fe9..6a24f388785 100644 --- a/boards/arm/mps2/mps2_an521_cpu0_ns.yaml +++ b/boards/arm/mps2/mps2_an521_cpu0_ns.yaml @@ -14,6 +14,5 @@ testing: only_tags: - arm - kernel - - tfm - userspace - trusted-firmware-m diff --git a/boards/arm/mps3/mps3_an547_ns.yaml b/boards/arm/mps3/mps3_an547_ns.yaml index 3852415834f..e58f636b555 100644 --- a/boards/arm/mps3/mps3_an547_ns.yaml +++ b/boards/arm/mps3/mps3_an547_ns.yaml @@ -18,4 +18,4 @@ toolchain: testing: default: true only_tags: - - tfm + - trusted-firmware-m diff --git a/tests/arch/arm/arm_thread_swap_tz/testcase.yaml b/tests/arch/arm/arm_thread_swap_tz/testcase.yaml index 808aa5250d2..fca7a79d1d3 100644 --- a/tests/arch/arm/arm_thread_swap_tz/testcase.yaml +++ b/tests/arch/arm/arm_thread_swap_tz/testcase.yaml @@ -3,7 +3,7 @@ common: tags: - arm - fpu - - tfm + - trusted-firmware-m arch_allow: arm tests: arch.arm.swap.tz: diff --git a/tests/net/lib/tls_credentials/testcase.yaml b/tests/net/lib/tls_credentials/testcase.yaml index 77e3ac8f283..2971f1b3b7c 100644 --- a/tests/net/lib/tls_credentials/testcase.yaml +++ b/tests/net/lib/tls_credentials/testcase.yaml @@ -10,5 +10,4 @@ tests: tags: - net - tls - - tfm - trusted-firmware-m