commit 73ed299b7b9bc24d32a66007452fda0c8810f407
author Xinyu Zhang <xinyu.zhang@arm.com> Wed Sep 15 11:38:23 2021 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Thu Sep 16 04:52:24 2021 +0200
tree fb506c934fc12d781590d916570647673a9de616
parent e89f45cc8dcac780a19da4ad71e55bb54b1462f8

Build: Replace build param TFM_PSA_API with LIB_MODEL

In TF-M build sys, TFM_PSA_API is no more used to set Lib/IPC model.
To build Library model, TFM_LIB_MODEL needs to be set to True.
TF-M Open CI also needs to align with this change.

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

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 1d05883..f804fc0 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -117,7 +117,7 @@
             "CONFIG_NAME={}",
             "TFM_PLATFORM={}",
             "TOOLCHAIN_FILE={}",
-            "PSA_API={}",
+            "LIB_MODEL={}",
             "ISOLATION_LEVEL={}",
             "TEST_REGRESSION={}",
             "TEST_PSA_API={}",
@@ -134,7 +134,7 @@
                 config,
                 config_details.tfm_platform,
                 config_details.toolchain_file,
-                config_details.psa_api,
+                config_details.lib_model,
                 config_details.isolation_level,
                 config_details.test_regression,
                 config_details.test_psa_api,
@@ -392,7 +392,7 @@
         overwrite_params = {"codebase_root_dir": build_cfg["codebase_root_dir"],
                             "tfm_platform": i.tfm_platform,
                             "toolchain_file": i.toolchain_file,
-                            "psa_api": i.psa_api,
+                            "lib_model": i.lib_model,
                             "isolation_level": i.isolation_level,
                             "test_regression": i.test_regression,
                             "test_psa_api": i.test_psa_api,
@@ -568,8 +568,10 @@
             config_param = []
             config_param.append(mapPlatform[list(i)[0]])
             config_param.append(mapCompiler[list(i)[1]])
-            if list(i)[2]:  # PSA_API
-                config_param.append("PSA")
+            if list(i)[2]:  # LIB_MODEL
+                config_param.append("LIB")
+            else:
+                config_param.append("IPC")
             config_param.append(list(i)[3]) # ISOLATION_LEVEL
             if list(i)[4]:  # TEST_REGRESSION
                 config_param.append("REG")