commit 85588520c51126c81c11cda48fc855ecaeb74f98
author Xinyu Zhang <xinyu.zhang@arm.com> Tue Oct 31 13:58:04 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Fri Nov 03 15:37:01 2023 +0800
tree 60ade4d636a5743599e77eaeea094cb0315c385d
parent f05a324391e01fe83d455767f7c412193be18812

build_helper_configs.py: Add NS toolchain file arg

Add a NS toolchain file argument in NSPE build config.
Enables NSPE build to select Armclang/GNUARM toolchain.
Right now only support NSPE to use the same toolchain file as SPE build
does.

Change-Id: Ia6cd5ab57a14b29cda793a34805f0fc85d721b2f
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 8e91651..499d171 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -49,7 +49,7 @@
         "-S %(tfm_tests_root_dir)s/%(test_root_dir)s/spe " + \
         "-B %(ci_build_root_dir)s/spe " + \
         "-DTFM_PLATFORM=%(tfm_platform)s " + \
-        "-DTFM_TOOLCHAIN_FILE=%(codebase_root_dir)s/%(compiler)s " + \
+        "-DTFM_TOOLCHAIN_FILE=%(codebase_root_dir)s/%(s_compiler)s " + \
         "-DTFM_ISOLATION_LEVEL=%(isolation_level)s " + \
         "%(test_regression)s " + \
         "-DCMAKE_BUILD_TYPE=%(cmake_build_type)s " + \
@@ -68,6 +68,7 @@
         "-S %(tfm_tests_root_dir)s/%(test_root_dir)s " + \
         "-B %(ci_build_root_dir)s/nspe " + \
         "-DCONFIG_SPE_PATH=%(ci_build_root_dir)s/spe/api_ns " + \
+        "-DTFM_TOOLCHAIN_FILE=%(ci_build_root_dir)s/spe/api_ns/cmake/%(ns_compiler)s " + \
         "%(extra_params)s " + \
         "-DQCBOR_PATH=%(codebase_root_dir)s/../qcbor ",