commit df88e305265f7c558a75d0a3ad2e93b3582fb915
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Sep 19 11:27:57 2022 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Mon Sep 19 11:28:07 2022 +0800
tree 3c0c77322b88fff27b3f50665077c7e815e03983
parent ebc400cb99613cdcc83ecd3e8de6fad3a8ad87b5

Build: Move PSOFF param from common to extra params

PS partition is enabled by default in most config groups.
Move it to extra params to simplify build config params.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I742eb7b0b6384b951eaa87aedec0b80d8487c62a

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 de81392..f79c9c2 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -121,7 +121,6 @@
             "CMAKE_BUILD_TYPE={}",
             "BL2={}",
             "PROFILE={}",
-            "PARTITION_PS={}",
             "EXTRA_PARAMS={}"
         ]
         print(
@@ -137,7 +136,6 @@
                 config_details.cmake_build_type,
                 config_details.with_bl2,
                 "N.A" if not config_details.profile else config_details.profile,
-                config_details.partition_ps,
                 "N.A" if not config_details.extra_params else config_details.extra_params,
             )
             .strip()
@@ -404,7 +402,6 @@
                             "cmake_build_type": i.cmake_build_type,
                             "with_bl2": i.with_bl2,
                             "profile": "" if i.profile=="N.A" else i.profile,
-                            "partition_ps": i.partition_ps,
                             "extra_params": self.map_extra_params(i.extra_params)}
         if i.test_psa_api == "IPC":
             overwrite_params["test_psa_api"] += " -DINCLUDE_PANIC_TESTS=1"
@@ -591,10 +588,8 @@
                 config_param.append("BL2")
             if list(i)[8]: # PROFILE
                 config_param.append(mapProfile[list(i)[8]])
-            if list(i)[9] == "OFF":    #PARTITION_PS
-                config_param.append("PSOFF")
-            if list(i)[10]: # EXTRA_PARAMS
-                config_param.append(list(i)[10].replace(", ", "_"))
+            if list(i)[9]: # EXTRA_PARAMS
+                config_param.append(list(i)[9].replace(", ", "_"))
             i_str = "_".join(config_param)
             ret_cfg[i_str] = i
         return ret_cfg