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.
pull/14333/head
Lingkai Dong 2021-02-15 14:38:57 +00:00
parent eb0ac59494
commit 63523bd0aa
4 changed files with 3 additions and 29 deletions

View File

@ -52,10 +52,3 @@ target_link_libraries(mbed-arm-musca-b1
${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o
mbed-arm-ssg
)
add_library(mbed-arm-musca-b1-ns INTERFACE)
target_link_libraries(mbed-arm-musca-b1-ns
INTERFACE
mbed-arm-musca-b1
)

View File

@ -58,10 +58,3 @@ target_link_libraries(mbed-arm-musca-s1
${CMAKE_CURRENT_SOURCE_DIR}/s_veneers.o
mbed-arm-ssg
)
add_library(mbed-arm-musca-s1-ns INTERFACE)
target_link_libraries(mbed-arm-musca-s1-ns
INTERFACE
mbed-arm-musca-s1
)

View File

@ -4726,8 +4726,7 @@
],
"extra_labels_add": [
"ARM_SSG",
"MUSCA_B1",
"MUSCA_B1_NS"
"MUSCA_B1"
],
"post_binary_hook": {
"function": "ArmMuscaB1Code.binary_hook"
@ -4742,11 +4741,6 @@
],
"tfm_delivery_dir": "TARGET_ARM_SSG/TARGET_MUSCA_B1"
},
"ARM_MUSCA_B1_NS": {
"inherits": [
"ARM_MUSCA_B1"
]
},
"ARM_MUSCA_S1": {
"inherits": [
"PSA_V8_M"
@ -4784,8 +4778,7 @@
],
"extra_labels_add": [
"ARM_SSG",
"MUSCA_S1",
"MUSCA_S1_NS"
"MUSCA_S1"
],
"post_binary_hook": {
"function": "ArmMuscaS1Code.binary_hook"
@ -4803,11 +4796,6 @@
"5009"
]
},
"ARM_MUSCA_S1_NS": {
"inherits": [
"ARM_MUSCA_S1"
]
},
"RZ_A1XX": {
"inherits": [
"Target"

View File

@ -41,7 +41,7 @@ LPC546XX, FF_LPC546XX, CY8CKIT064B0S2_4343W, CYTFM_064B0S2_4343W, CYSBSYSKIT_01.
The following Mbed boards do not have post build operations support as TFM
is not yet supported:
ARM_MUSCA_B1, ARM_MUSCA_B1_NS, ARM_MUSCA_S1, ARM_MUSCA_S1_NS.
ARM_MUSCA_B1, ARM_MUSCA_S1.
### Supported toolchains