Skip to content

Commit 63523bd

Browse files
committed
Remove _NS aliases for Musca B1/S1
In targets.json, ARM_MUSCA_B1 and ARM_MUSCA_S1 have alias target names suffixed with `_NS`. They are identical to targets without `_NS` and exist purely for compatibility with the old naming convention we had. The CI builds them as separate targets and uses extra resources. As we are upgrading Musca targets to TF-M v1.2, it's time to clean up the aliases.
1 parent eb0ac59 commit 63523bd

File tree

4 files changed

+3
-29
lines changed

4 files changed

+3
-29
lines changed

targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,3 @@ target_link_libraries(mbed-arm-musca-b1
5252
${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o
5353
mbed-arm-ssg
5454
)
55-
56-
add_library(mbed-arm-musca-b1-ns INTERFACE)
57-
58-
target_link_libraries(mbed-arm-musca-b1-ns
59-
INTERFACE
60-
mbed-arm-musca-b1
61-
)

targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,3 @@ target_link_libraries(mbed-arm-musca-s1
5858
${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o
5959
mbed-arm-ssg
6060
)
61-
62-
add_library(mbed-arm-musca-s1-ns INTERFACE)
63-
64-
target_link_libraries(mbed-arm-musca-s1-ns
65-
INTERFACE
66-
mbed-arm-musca-s1
67-
)

targets/targets.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4726,8 +4726,7 @@
47264726
],
47274727
"extra_labels_add": [
47284728
"ARM_SSG",
4729-
"MUSCA_B1",
4730-
"MUSCA_B1_NS"
4729+
"MUSCA_B1"
47314730
],
47324731
"post_binary_hook": {
47334732
"function": "ArmMuscaB1Code.binary_hook"
@@ -4742,11 +4741,6 @@
47424741
],
47434742
"tfm_delivery_dir": "TARGET_ARM_SSG/TARGET_MUSCA_B1"
47444743
},
4745-
"ARM_MUSCA_B1_NS": {
4746-
"inherits": [
4747-
"ARM_MUSCA_B1"
4748-
]
4749-
},
47504744
"ARM_MUSCA_S1": {
47514745
"inherits": [
47524746
"PSA_V8_M"
@@ -4784,8 +4778,7 @@
47844778
],
47854779
"extra_labels_add": [
47864780
"ARM_SSG",
4787-
"MUSCA_S1",
4788-
"MUSCA_S1_NS"
4781+
"MUSCA_S1"
47894782
],
47904783
"post_binary_hook": {
47914784
"function": "ArmMuscaS1Code.binary_hook"
@@ -4803,11 +4796,6 @@
48034796
"5009"
48044797
]
48054798
},
4806-
"ARM_MUSCA_S1_NS": {
4807-
"inherits": [
4808-
"ARM_MUSCA_S1"
4809-
]
4810-
},
48114799
"RZ_A1XX": {
48124800
"inherits": [
48134801
"Target"

tools/cmake/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ LPC546XX, FF_LPC546XX, CY8CKIT064B0S2_4343W, CYTFM_064B0S2_4343W, CYSBSYSKIT_01.
4141

4242
The following Mbed boards do not have post build operations support as TFM
4343
is not yet supported:
44-
ARM_MUSCA_B1, ARM_MUSCA_B1_NS, ARM_MUSCA_S1, ARM_MUSCA_S1_NS.
44+
ARM_MUSCA_B1, ARM_MUSCA_S1.
4545

4646
### Supported toolchains
4747

0 commit comments

Comments
 (0)