commit ce9c4513ce452db5a6a639b8bd2e8f2ea46dce82
author David Hu <david.hu@arm.com> Wed Oct 25 23:41:07 2023 +0800
committer David Hu <david.hu@arm.com> Thu Oct 26 09:20:34 2023 +0800
tree dbcae74e56853bd3f77b269a5b17e6e56011b61f
parent 80e73517226c8f65ba52eaad982239cdd6d99b51

build_helper_configs.py: Remove ns_target arg

With TF-M commit [1], users can skip specifying NS output target name in
build command line.
Remove ns_target related settings.

[1] https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/24353

Change-Id: I9d7602e5d6d6d2c068427c6e92e7feebd1271d18
Signed-off-by: David Hu <david.hu@arm.com>

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index cce3c66..c2e5ad0 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -74,7 +74,7 @@
 
     # CMake build commands will be executed for every build.
     "spe_cmake_build":  "cmake --build %(ci_build_root_dir)s/spe -- install",
-    "nspe_cmake_build": "cmake --build %(ci_build_root_dir)s/nspe -- %(ns_target)s",
+    "nspe_cmake_build": "cmake --build %(ci_build_root_dir)s/nspe --",
 
     "set_compiler_path": "export PATH=$PATH:$%(compiler)s_PATH",
 

tfm_ci_pylib/tfm_build_manager.py

diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 091e855..7721a8c 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -87,15 +87,6 @@
 
         return toolchain
 
-    def choose_ns_target(self, with_bl2):
-        ns_target = ""
-        if with_bl2:
-            ns_target = "tfm_app_binaries"
-        else:
-            ns_target = "tfm_ns"
-
-        return ns_target
-
     def get_compiler_name(self, compiler):
         compiler_name = ""
         if "GCC"in compiler:
@@ -397,7 +388,6 @@
                             "tfm_platform": i.tfm_platform,
                             "s_compiler": self.choose_toolchain(i.compiler, s_build = True),
                             "ns_compiler": self.choose_toolchain(i.compiler, s_build = False),
-                            "ns_target": self.choose_ns_target(i.with_bl2),
                             "isolation_level": i.isolation_level,
                             "test_regression": self.map_params(i.test_regression, mapRegTest),
                             "test_psa_api": i.test_psa_api,