From 63523bd0aa48d44e1a6c725736db4229b714be7a Mon Sep 17 00:00:00 2001
From: Lingkai Dong <lingkai.dong@arm.com>
Date: Mon, 15 Feb 2021 14:38:57 +0000
Subject: [PATCH] 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.
---
 .../TARGET_MUSCA_B1/CMakeLists.txt               |  7 -------
 .../TARGET_MUSCA_S1/CMakeLists.txt               |  7 -------
 targets/targets.json                             | 16 ++--------------
 tools/cmake/README.md                            |  2 +-
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt
index 9fe9672286..6d2116cde2 100644
--- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt
+++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/CMakeLists.txt
@@ -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
-)
diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt b/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt
index f5d6b7d71c..13309e20e0 100644
--- a/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt
+++ b/targets/TARGET_ARM_SSG/TARGET_MUSCA_S1/CMakeLists.txt
@@ -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
-)
diff --git a/targets/targets.json b/targets/targets.json
index f52bf24c59..3f92a9194d 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -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"
diff --git a/tools/cmake/README.md b/tools/cmake/README.md
index 830d23c2cc..34a324f163 100644
--- a/tools/cmake/README.md
+++ b/tools/cmake/README.md
@@ -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