commit 90dc284d8cde70d000396c2ee1ca47c0bf200c16
author David Hu <david.hu@arm.com> Tue Oct 17 20:39:42 2023 +0800
committer David Hu <david.hu@arm.com> Wed Oct 18 11:33:40 2023 +0800
tree 276baaf81621812f4dec39d1ec18b6a3709410c4
parent d5fea0ddcc767dbe37cf003dca201334d1b82801

build_helper_configs.py: Select target tfm_ns when BL2=OFF

tfm_app_binaries are built only when BL2=ON.
Build target tfm_ns instead when BL2=OFF.
Pass PLATFORM_DEFAULT_IMAGE_SIGNING to NS build to control image signing
together with BL2.

It is a temporal workaround to mitigate the difference between
toolchains.

Change-Id: I221d16fd36ddbd5a655bb0132c94ebefcd344b8c
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 5b63ce6..835e031 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 -- tfm_app_binaries",
+    "nspe_cmake_build": "cmake --build %(ci_build_root_dir)s/nspe -- %(ns_target)s",
 
     "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 7721a8c..091e855 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -87,6 +87,15 @@
 
         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:
@@ -388,6 +397,7 @@
                             "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,