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
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 82ac5d9..e6a02e3 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -31,7 +31,7 @@
# configuration tuples
"sort_order": ["tfm_platform",
"toolchain_file",
- "psa_api",
+ "lib_model",
"isolation_level",
"test_regression",
"test_psa_api",
@@ -48,7 +48,7 @@
"config_template": "cmake " + \
"-DTFM_PLATFORM=%(tfm_platform)s " + \
"-DTFM_TOOLCHAIN_FILE=%(codebase_root_dir)s/%(toolchain_file)s " + \
- "-DTFM_PSA_API=%(psa_api)s " + \
+ "-DTFM_LIB_MODEL=%(lib_model)s " + \
"-DTFM_ISOLATION_LEVEL=%(isolation_level)s " + \
"-DTEST_NS=%(test_regression)s -DTEST_S=%(test_regression)s " + \
"-DTEST_PSA_API=%(test_psa_api)s " + \
@@ -135,13 +135,13 @@
# Load range overlap on Musca for IPC Debug type: T895
("arm/musca_b1/sse_200", "toolchain_ARMCLANG.cmake", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*"),
("arm/musca_s1", "toolchain_ARMCLANG.cmake", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*"),
- # LVL2 and LVL3 requires PSA api
- ("*", "*", False, "2", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("*", "*", False, "3", "*", "*", "*", "*", "*", "*", "*", "*"),
+ # LVL2 and LVL3 requires IPC model
+ ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", True, "3", "*", "*", "*", "*", "*", "*", "*", "*"),
# Regression requires NS
("*", "*", "*", "*", True, "*", "*", "*", "*", False, "*", "*"),
- # psoc64 requires PSA api
- ("cypress/psoc64", "*", False, "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ # psoc64 requires IPC model
+ ("cypress/psoc64", "*", True, "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# No PSA_ACK with regression
("*", "*", "*", "*", True, "IPC", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "*", True, "CRYPTO", "*", "*", "*", "*", "*", "*"),
@@ -166,8 +166,8 @@
("cypress/psoc64", "*", "*", "*", "*", "*", "Debug", "*", "*", "*", "*", "*"),
# Musca b1 does not support Profile S
("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*"),
- # Musca B1 Secure Enclave requires PSA api, BL2, and supports only Isolation Level 1
- ("arm/musca_b1/secure_enclave", "*", False, "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ # Musca B1 Secure Enclave requires IPC model, BL2, and supports only Isolation Level 1
+ ("arm/musca_b1/secure_enclave", "*", True, "*", "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*"),
("arm/musca_b1/secure_enclave", "*", "*", "2", "*", "*", "*", "*", "*", "*", "*", "*"),
# Musca B1 Secure Enclave does not support tests, profiles, NS side building
@@ -184,16 +184,16 @@
("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "OFF"),
# PARTITION_PS should be OFF for Profile S
("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "ON"),
- # Proile M only support for PSA_API
- ("*", "*", False, "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*"),
+ # Proile M only support for IPC model
+ ("*", "*", True, "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*"),
# Profile M only support for Isolation Level 2
("*", "*", "*", "1", "*", "*", "*", "*", "*", "*", "profile_medium", "*"),
("*", "*", "*", "3", "*", "*", "*", "*", "*", "*", "profile_medium", "*"),
# Profile L only support for Isolation Level 3
("*", "*", "*", "1", "*", "*", "*", "*", "*", "*", "profile_large", "*"),
("*", "*", "*", "2", "*", "*", "*", "*", "*", "*", "profile_large", "*"),
- # Profile S does not support PSA_API
- ("*", "*", True, "*", "*", "*", "*", "*", "*", "*", "profile_small", "*"),
+ # Profile S does not support IPC model
+ ("*", "*", False, "*", "*", "*", "*", "*", "*", "*", "profile_small", "*"),
# Profile S only supports Isolation Level 2
("*", "*", "*", "2", "*", "*", "*", "*", "*", "*", "profile_small", "*"),
# Only AN521 and MUSCA_B1 support Isolation Level 3
@@ -220,7 +220,7 @@
"tfm_platform": ["arm/mps3/an524"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -239,7 +239,7 @@
"tfm_platform": ["arm/mps2/an521"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -259,7 +259,7 @@
"arm/musca_s1"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["CRYPTO",
@@ -281,7 +281,7 @@
"arm/musca_s1"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["IPC"],
@@ -300,7 +300,7 @@
"tfm_platform": ["arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["CRYPTO",
@@ -321,7 +321,7 @@
"tfm_platform": ["arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["IPC"],
@@ -340,7 +340,7 @@
"tfm_platform": ["cypress/psoc64"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -359,7 +359,7 @@
"tfm_platform": ["stm/stm32l562e_dk"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -377,7 +377,7 @@
config_LPCXPRESSO55S69 = {"seed_params": {
"tfm_platform": ["nxp/lpcxpresso55s69"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -395,7 +395,7 @@
config_diphda = {"seed_params": {
"tfm_platform": ["arm/diphda"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1"],
"test_regression": [False],
"test_psa_api": ["OFF"],
@@ -414,7 +414,7 @@
"tfm_platform": ["arm/mps2/an519"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -434,7 +434,7 @@
"arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -458,7 +458,7 @@
"nxp/lpcxpresso55s69"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -491,7 +491,7 @@
"arm/musca_b1/sse_200", "arm/musca_s1"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -510,7 +510,7 @@
"tfm_platform": ["arm/mps2/an519", "arm/mps3/an524"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -533,7 +533,7 @@
"arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -560,7 +560,7 @@
"tfm_platform": ["arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -579,7 +579,7 @@
"tfm_platform": ["arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -598,7 +598,7 @@
"tfm_platform": ["arm/musca_b1/secure_enclave"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1"],
"test_regression": [False],
"test_psa_api": ["OFF"],
@@ -617,7 +617,7 @@
"tfm_platform": ["arm/musca_s1"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -638,7 +638,7 @@
"arm/mps3/an524"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -662,7 +662,7 @@
"arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [False],
"test_psa_api": ["IPC",
@@ -688,7 +688,7 @@
"arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2"],
"test_regression": [False],
"test_psa_api": ["IPC"],
@@ -714,7 +714,7 @@
"stm/stm32l562e_dk"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -751,7 +751,7 @@
"arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -779,7 +779,7 @@
"arm/musca_s1"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["CRYPTO",
@@ -801,7 +801,7 @@
"arm/musca_s1"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2", "3"],
"test_regression": [False],
"test_psa_api": ["IPC"],
@@ -820,7 +820,7 @@
"tfm_platform": ["arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -839,7 +839,7 @@
"tfm_platform": ["stm/stm32l562e_dk"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -857,7 +857,7 @@
config_nightly_LPCXPRESSO55S69 = {"seed_params": {
"tfm_platform": ["nxp/lpcxpresso55s69"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -877,7 +877,7 @@
"arm/musca_s1"],
"toolchain_file": ["toolchain_GNUARM.cmake",
"toolchain_ARMCLANG.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -891,34 +891,34 @@
"common_params": _common_tfm_builder_cfg,
"valid": [
("arm/mps2/an521", "toolchain_GNUARM.cmake",
- False, "1", False, "OFF", "Debug",
+ True, "1", False, "OFF", "Debug",
"off", True, True, "", "ON"),
("arm/mps2/an521", "toolchain_ARMCLANG.cmake",
- True, "2", False, "OFF", "Debug",
+ False, "2", False, "OFF", "Debug",
"off", True, True, "", "ON"),
("arm/mps2/an521", "toolchain_ARMCLANG.cmake",
- True, "3", False, "OFF", "Release",
+ False, "3", False, "OFF", "Release",
"off", True, True, "", "ON"),
("arm/mps2/an521", "toolchain_GNUARM.cmake",
- True, "2", False, "OFF", "Debug",
+ False, "2", False, "OFF", "Debug",
"off", True, True, "profile_medium", "ON"),
("arm/mps2/an521", "toolchain_GNUARM.cmake",
- True, "3", False, "OFF", "Debug",
+ False, "3", False, "OFF", "Debug",
"off", True, True, "profile_large", "ON"),
- # AN521_GNUARM_PSA_2_REG_Release_BL2_NS_MEDIUM_PSOFF
- ("arm/mps2/an521", "toolchain_GNUARM.cmake", True,
+ # AN521_GNUARM_IPC_2_REG_Release_BL2_NS_MEDIUM_PSOFF
+ ("arm/mps2/an521", "toolchain_GNUARM.cmake", False,
"2", True, "OFF", "Release", "off", True, True, "profile_medium", "OFF"),
- # MUSCA_B1_GNUARM_1_REG_Minsizerel_BL2_NS
- ("arm/musca_b1/sse_200", "toolchain_GNUARM.cmake", False,
+ # MUSCA_B1_GNUARM_LIB_1_REG_Minsizerel_BL2_NS
+ ("arm/musca_b1/sse_200", "toolchain_GNUARM.cmake", True,
"1", True, "OFF", "Minsizerel", "off", True, True, "", "ON"),
- # stm32l562e_dk_ARMCLANG_PSA_1_REG_Release_BL2_NS
- ("stm/stm32l562e_dk", "toolchain_ARMCLANG.cmake", True,
+ # stm32l562e_dk_ARMCLANG_IPC_1_REG_Release_BL2_NS
+ ("stm/stm32l562e_dk", "toolchain_ARMCLANG.cmake", False,
"1", True, "OFF", "Release", "off", True, True, "", "ON"),
- # stm32l562e_dk_GNUARM_PSA_2_REG_Release_BL2_NS
- ("stm/stm32l562e_dk", "toolchain_GNUARM.cmake", True,
+ # stm32l562e_dk_GNUARM_IPC_2_REG_Release_BL2_NS
+ ("stm/stm32l562e_dk", "toolchain_GNUARM.cmake", False,
"2", True, "OFF", "Release", "off", True, True, "", "ON"),
- # stm32l562e_dk_GNUARM_PSA_3_REG_Release_BL2_NS
- ("stm/stm32l562e_dk", "toolchain_GNUARM.cmake", True,
+ # stm32l562e_dk_GNUARM_IPC_3_REG_Release_BL2_NS
+ ("stm/stm32l562e_dk", "toolchain_GNUARM.cmake", False,
"3", True, "OFF", "Release", "off", True, True, "", "ON"),
],
"invalid": _common_tfm_invalid_configs + [
@@ -950,7 +950,7 @@
"*", "*", "*", "*", "profile_small", "*"),
("*", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*",
"*", "*", "*", "*", "profile_medium", "*"),
- ("*", "toolchain_ARMCLANG.cmake", False, "*", "*", "*",
+ ("*", "toolchain_ARMCLANG.cmake", True, "*", "*", "*",
"*", "*", "*", "*", "*", "*"),
]
}
@@ -958,7 +958,7 @@
config_pp_OTP = {"seed_params": {
"tfm_platform": ["arm/musca_b1/sse_200"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -977,7 +977,7 @@
config_pp_PSA_API = {"seed_params": {
"tfm_platform": ["arm/mps2/an521"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["2"],
"test_regression": [False],
"test_psa_api": ["IPC",
@@ -998,7 +998,7 @@
config_pp_PSoC64 = {"seed_params": {
"tfm_platform": ["cypress/psoc64"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True],
+ "lib_model": [False],
"isolation_level": ["1", "2"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -1016,7 +1016,7 @@
config_cov_an519 = {"seed_params": {
"tfm_platform": ["arm/mps2/an519"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -1034,7 +1034,7 @@
config_cov_an521 = {"seed_params": {
"tfm_platform": ["arm/mps2/an521"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2", "3"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -1069,7 +1069,7 @@
config_debug = {"seed_params": {
"tfm_platform": ["arm/mps2/an521"],
"toolchain_file": ["toolchain_ARMCLANG.cmake"],
- "psa_api": [False],
+ "lib_model": [True],
"isolation_level": ["1"],
"test_regression": [False],
"test_psa_api": ["OFF"],
@@ -1089,7 +1089,7 @@
"tfm_platform": ["arm/mps2/an521"],
"toolchain_file": ["toolchain_ARMCLANG.cmake",
"toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True, False],
"test_psa_api": ["OFF"],
@@ -1102,9 +1102,9 @@
},
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
- ("*", "toolchain_ARMCLANG.cmake", True, "*", "*", "*",
+ ("*", "toolchain_ARMCLANG.cmake", False, "*", "*", "*",
"*", "*", "*", "*", "*", "*"),
- ("*", "toolchain_ARMCLANG.cmake", False, "1", "*", "*",
+ ("*", "toolchain_ARMCLANG.cmake", True, "1", "*", "*",
"*", "*", False, "*", "*", "*"),
]
}
@@ -1112,7 +1112,7 @@
config_lava_debug = {"seed_params": {
"tfm_platform": ["arm/mps2/an521", "arm/mps2/an519"],
"toolchain_file": ["toolchain_GNUARM.cmake"],
- "psa_api": [True, False],
+ "lib_model": [True, False],
"isolation_level": ["1", "2"],
"test_regression": [True],
"test_psa_api": ["OFF"],
@@ -1125,7 +1125,7 @@
},
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
- ("arm/mps2/an521", "toolchain_GNUARM.cmake", True, "2", "*", "*",
+ ("arm/mps2/an521", "toolchain_GNUARM.cmake", False, "2", "*", "*",
"*", "*", True, "*", "*", "*")
]
}
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 8beea1b..534bbe1 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -37,38 +37,38 @@
"INITIAL_ATTESTATION": "Attest",
"IPC": "FF"]
-// PSA_API, ISOLATION_LEVEL, TEST_REG, TEST_PSA_API, PROFILE, CONFIG_NAME
+// LIB_MODEL, ISOLATION_LEVEL, TEST_REG, TEST_PSA_API, PROFILE, CONFIG_NAME
mapConfigs = [
- ["False", "1", "False", "OFF", "N.A", "Default"],
- ["True", "1", "False", "OFF", "N.A", "CoreIPC"],
- ["True", "2", "False", "OFF", "N.A", "CoreIPCTfmLevel2"],
- ["True", "3", "False", "OFF", "N.A", "CoreIPCTfmLevel3"],
- ["False", "1", "False", "OFF", "profile_small", "DefaultProfileS"],
- ["True", "2", "False", "OFF", "profile_medium", "DefaultProfileM"],
- ["True", "3", "False", "OFF", "profile_large", "DefaultProfileL"],
- ["False", "1", "True", "OFF", "N.A", "Regression"],
- ["True", "1", "True", "OFF", "N.A", "RegressionIPC"],
- ["True", "2", "True", "OFF", "N.A", "RegressionIPCTfmLevel2"],
- ["True", "3", "True", "OFF", "N.A", "RegressionIPCTfmLevel3"],
- ["False", "1", "True", "OFF", "profile_small", "RegressionProfileS"],
- ["True", "2", "True", "OFF", "profile_medium", "RegressionProfileM"],
- ["True", "3", "True", "OFF", "profile_large", "RegressionProfileL"],
- ["False", "1", "False", "STORAGE", "N.A", "PsaApiTest (STORAGE)"],
- ["False", "1", "False", "CRYPTO", "N.A", "PsaApiTest (Crypto)"],
- ["False", "1", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTest (Attest)"],
- ["False", "1", "False", "IPC", "N.A", "PsaApiTest (FF)"],
- ["True", "1", "False", "STORAGE", "N.A", "PsaApiTestIPC (STORAGE)"],
- ["True", "1", "False", "CRYPTO", "N.A", "PsaApiTestIPC (Crypto)"],
- ["True", "1", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTestIPC (Attest)"],
- ["True", "1", "False", "IPC", "N.A", "PsaApiTestIPC (FF)"],
- ["True", "2", "False", "STORAGE", "N.A", "PsaApiTestIPCTfmLevel2 (STORAGE)"],
- ["True", "2", "False", "CRYPTO", "N.A", "PsaApiTestIPCTfmLevel2 (Crypto)"],
- ["True", "2", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTestIPCTfmLevel2 (Attest)"],
- ["True", "2", "False", "IPC", "N.A", "PsaApiTestIPCTfmLevel2 (FF)"],
- ["True", "3", "False", "STORAGE", "N.A", "PsaApiTestIPCTfmLevel3 (STORAGE)"],
- ["True", "3", "False", "CRYPTO", "N.A", "PsaApiTestIPCTfmLevel3 (Crypto)"],
- ["True", "3", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTestIPCTfmLevel3 (Attest)"],
- ["True", "3", "False", "IPC", "N.A", "PsaApiTestIPCTfmLevel3 (FF)"],
+ ["True", "1", "False", "OFF", "N.A", "Default"],
+ ["False", "1", "False", "OFF", "N.A", "CoreIPC"],
+ ["False", "2", "False", "OFF", "N.A", "CoreIPCTfmLevel2"],
+ ["False", "3", "False", "OFF", "N.A", "CoreIPCTfmLevel3"],
+ ["True", "1", "False", "OFF", "profile_small", "DefaultProfileS"],
+ ["False", "2", "False", "OFF", "profile_medium", "DefaultProfileM"],
+ ["False", "3", "False", "OFF", "profile_large", "DefaultProfileL"],
+ ["True", "1", "True", "OFF", "N.A", "Regression"],
+ ["False", "1", "True", "OFF", "N.A", "RegressionIPC"],
+ ["False", "2", "True", "OFF", "N.A", "RegressionIPCTfmLevel2"],
+ ["False", "3", "True", "OFF", "N.A", "RegressionIPCTfmLevel3"],
+ ["True", "1", "True", "OFF", "profile_small", "RegressionProfileS"],
+ ["False", "2", "True", "OFF", "profile_medium", "RegressionProfileM"],
+ ["False", "3", "True", "OFF", "profile_large", "RegressionProfileL"],
+ ["True", "1", "False", "STORAGE", "N.A", "PsaApiTest (STORAGE)"],
+ ["True", "1", "False", "CRYPTO", "N.A", "PsaApiTest (Crypto)"],
+ ["True", "1", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTest (Attest)"],
+ ["True", "1", "False", "IPC", "N.A", "PsaApiTest (FF)"],
+ ["False", "1", "False", "STORAGE", "N.A", "PsaApiTestIPC (STORAGE)"],
+ ["False", "1", "False", "CRYPTO", "N.A", "PsaApiTestIPC (Crypto)"],
+ ["False", "1", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTestIPC (Attest)"],
+ ["False", "1", "False", "IPC", "N.A", "PsaApiTestIPC (FF)"],
+ ["False", "2", "False", "STORAGE", "N.A", "PsaApiTestIPCTfmLevel2 (STORAGE)"],
+ ["False", "2", "False", "CRYPTO", "N.A", "PsaApiTestIPCTfmLevel2 (Crypto)"],
+ ["False", "2", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTestIPCTfmLevel2 (Attest)"],
+ ["False", "2", "False", "IPC", "N.A", "PsaApiTestIPCTfmLevel2 (FF)"],
+ ["False", "3", "False", "STORAGE", "N.A", "PsaApiTestIPCTfmLevel3 (STORAGE)"],
+ ["False", "3", "False", "CRYPTO", "N.A", "PsaApiTestIPCTfmLevel3 (Crypto)"],
+ ["False", "3", "False", "INITIAL_ATTESTATION", "N.A", "PsaApiTestIPCTfmLevel3 (Attest)"],
+ ["False", "3", "False", "IPC", "N.A", "PsaApiTestIPCTfmLevel3 (FF)"],
]
cfgs = ["Default", "CoreIPC", "CoreIPCTfmLevel2", "CoreIPCTfmLevel3",
@@ -105,7 +105,7 @@
value: mapTestPsaApi[build_params["TEST_PSA_API"]])
configName = "Config"
- config_params = [build_params["PSA_API"], build_params["ISOLATION_LEVEL"], \
+ config_params = [build_params["LIB_MODEL"], build_params["ISOLATION_LEVEL"], \
build_params["TEST_REGRESSION"], build_params["TEST_PSA_API"], \
build_params["PROFILE"]]
for (config in mapConfigs) {
@@ -326,7 +326,7 @@
result.value[2]['CMAKE_BUILD_TYPE'], \
result.value[2]['BL2'], \
result.value[2]['NS'], \
- result.value[2]['PSA_API'], \
+ result.value[2]['LIB_MODEL'], \
result.value[2]['ISOLATION_LEVEL'], \
result.value[2]['TEST_REGRESSION'], \
result.value[2]['TEST_PSA_API'], \
diff --git a/memory_footprint.py b/memory_footprint.py
index cf8c472..dfa5537 100644
--- a/memory_footprint.py
+++ b/memory_footprint.py
@@ -97,43 +97,43 @@
try :
cfg = get_configs_by_name([CI_CONFIG])[CI_CONFIG]
- if (cfg.psa_api and cfg.isolation_level == "1" and
+ if (not cfg.lib_model and cfg.isolation_level == "1" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Release" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "" and cfg.partition_ps == "ON"):
name_config = "CoreIPC"
- elif (not cfg.psa_api and cfg.isolation_level == "1" and
+ elif (cfg.lib_model and cfg.isolation_level == "1" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Release" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "" and cfg.partition_ps == "ON"):
name_config = "Default"
- elif (cfg.psa_api and cfg.isolation_level == "2" and
+ elif (not cfg.lib_model and cfg.isolation_level == "2" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Release" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "" and cfg.partition_ps == "ON"):
name_config = "CoreIPCTfmLevel2"
- elif (not cfg.psa_api and cfg.isolation_level == "1" and
+ elif (cfg.lib_model and cfg.isolation_level == "1" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Release" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_small" and cfg.partition_ps == "OFF"):
name_config = "DefaultProfileS"
- elif (not cfg.psa_api and cfg.isolation_level == "1" and
+ elif (cfg.lib_model and cfg.isolation_level == "1" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Minsizerel" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_small" and cfg.partition_ps == "OFF"):
name_config = "MinSizeProfileS"
- elif (cfg.psa_api and cfg.isolation_level == "2" and
+ elif (not cfg.lib_model and cfg.isolation_level == "2" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Release" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_medium" and cfg.partition_ps == "ON"):
name_config = "DefaultProfileM"
- elif (cfg.psa_api and cfg.isolation_level == "3" and
+ elif (not cfg.lib_model and cfg.isolation_level == "3" and
not cfg.test_regression and cfg.test_psa_api == "OFF" and
cfg.cmake_build_type == "Release" and cfg.with_otp == "off" and
cfg.with_bl2 and cfg.with_ns and
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")