commit 379abb635a627321e13ad7e2aacbcbd382903770
author Summer Qin <summer.qin@arm.com> Sat Oct 08 16:41:54 2022 +0800
committer David Hu <david.hu@arm.com> Wed Oct 19 11:00:43 2022 +0200
tree 9d9b1b0508c15fd355e031b7e0fb972efb000242
parent 0c8d320176d0d92d7bc5b83c2e775637d880de03

Build: Remove Library model build param

Library model is deprecated in TF-M.
So it is no more needed in ci script.

Signed-off-by: Summer Qin <summer.qin@arm.com>
Change-Id: I3b788ee63cf43f6baa0298b83e5f568110af2e58

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 f79c9c2..ff48960 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -114,7 +114,6 @@
             "CONFIG_NAME={}",
             "TFM_PLATFORM={}",
             "COMPILER={}",
-            "LIB_MODEL={}",
             "ISOLATION_LEVEL={}",
             "TEST_REGRESSION={}",
             "TEST_PSA_API={}",
@@ -129,7 +128,6 @@
                 config,
                 config_details.tfm_platform,
                 config_details.compiler,
-                config_details.lib_model,
                 config_details.isolation_level,
                 config_details.test_regression,
                 config_details.test_psa_api,
@@ -395,7 +393,6 @@
         overwrite_params = {"codebase_root_dir": build_cfg["codebase_root_dir"],
                             "tfm_platform": i.tfm_platform,
                             "compiler": self.choose_toolchain(i.compiler),
-                            "lib_model": i.lib_model,
                             "isolation_level": i.isolation_level,
                             "test_regression": i.test_regression,
                             "test_psa_api": i.test_psa_api,
@@ -574,22 +571,18 @@
             config_param = []
             config_param.append(mapPlatform[list(i)[0]])
             config_param.append(list(i)[1].split("_")[0])
-            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(list(i)[2]) # ISOLATION_LEVEL
+            if list(i)[3]:  # TEST_REGRESSION
                 config_param.append("REG")
-            if list(i)[5] != "OFF":    #TEST_PSA_API
-                config_param.append(mapTestPsaApi[list(i)[5]])
-            config_param.append(list(i)[6]) # BUILD_TYPE
-            if list(i)[7]:  # BL2
+            if list(i)[4] != "OFF":    #TEST_PSA_API
+                config_param.append(mapTestPsaApi[list(i)[4]])
+            config_param.append(list(i)[5]) # BUILD_TYPE
+            if list(i)[6]:  # BL2
                 config_param.append("BL2")
-            if list(i)[8]: # PROFILE
-                config_param.append(mapProfile[list(i)[8]])
-            if list(i)[9]: # EXTRA_PARAMS
-                config_param.append(list(i)[9].replace(", ", "_"))
+            if list(i)[7]: # PROFILE
+                config_param.append(mapProfile[list(i)[7]])
+            if list(i)[8]: # EXTRA_PARAMS
+                config_param.append(list(i)[8].replace(", ", "_"))
             i_str = "_".join(config_param)
             ret_cfg[i_str] = i
         return ret_cfg