Build: Move MMIO into extra_params
MMIO is not a common config which is needed in all config groups.
To make CI configs easier to maintain, move MMIO into extra_params.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I05de13844d9292aa1b977b9b4c929bf3239b735e
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 55398a2..aaa4905 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -41,7 +41,6 @@
"with_ns",
"profile",
"partition_ps",
- "mmio",
"fp",
"lazy",
"extra_params"],
@@ -66,7 +65,6 @@
"-DMCUBOOT_PATH=%(codebase_root_dir)s/../mcuboot " + \
"-DTFM_PROFILE=%(profile)s " + \
"-DTFM_PARTITION_PROTECTED_STORAGE=%(partition_ps)s " + \
- "-DPSA_FRAMEWORK_HAS_MM_IOVEC=%(mmio)s " + \
"-DCONFIG_TFM_SPE_FP=%(fp)s " + \
"-DCONFIG_TFM_LAZY_STACKING_SPE=%(lazy)s " + \
"%(extra_params)s " + \
@@ -148,101 +146,101 @@
# List of all build configs that are impossible under all circumstances
_common_tfm_invalid_configs = [
# LR_CODE size exceeds limit on MUSCA_B1 & MUSCA_S1 with regression tests in Debug mode built with ARMCLANG
- ("arm/musca_b1/sse_200", "toolchain_ARMCLANG.cmake", "*", "*", True, "OFF", "Debug", "*", "*", "*", "", "*", "*", "*", "*", "*"),
- ("arm/musca_s1", "toolchain_ARMCLANG.cmake", "*", "*", True, "OFF", "Debug", "*", "*", "*", "", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/sse_200", "toolchain_ARMCLANG.cmake", "*", "*", True, "OFF", "Debug", "*", "*", "*", "", "*", "*", "*", "*"),
+ ("arm/musca_s1", "toolchain_ARMCLANG.cmake", "*", "*", True, "OFF", "Debug", "*", "*", "*", "", "*", "*", "*", "*"),
# 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", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/sse_200", "toolchain_ARMCLANG.cmake", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_s1", "toolchain_ARMCLANG.cmake", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*", "*", "*", "*"),
# Oversize issue on config lpcxpresso55s69_GNUARM_IPC_2_Relwithdebinfo_BL2_NS_MEDIUM
("nxp/lpcxpresso55s69", "toolchain_GNUARM.cmake", False, "2", False, "OFF",
- "Relwithdebinfo", "off", True, True, "profile_medium", "ON", "OFF", "*", "*", "*"),
+ "Relwithdebinfo", "off", True, True, "profile_medium", "ON", "*", "*", "*"),
# Oversize issue on config stm32l562e_dk_ARMCLANG_LIB_1_REG_Release_BL2_NS
("stm/stm32l562e_dk", "toolchain_ARMCLANG.cmake", True, "1", True, "OFF",
- "Release", "off", True, True, "", "ON", "OFF", "*", "*", "*"),
+ "Release", "off", True, True, "", "ON", "*", "*", "*"),
# LVL2 and LVL3 requires IPC model
- ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("*", "*", True, "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", True, "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# Regression requires NS
- ("*", "*", "*", "*", True, "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", True, "*", "*", "*", "*", False, "*", "*", "*", "*", "*"),
# psoc64 requires IPC model
- ("cypress/psoc64", "*", True, "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("cypress/psoc64", "*", True, "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# No PSA_ACK with regression
- ("*", "*", "*", "*", True, "IPC", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", True, "CRYPTO", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", True, "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", True, "STORAGE", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", True, "IPC", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", True, "CRYPTO", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", True, "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", True, "STORAGE", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# PSA_ACK requires NS
- ("*", "*", "*", "*", "*", "IPC", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "*", "*", "STORAGE", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "IPC", "*", "*", "*", False, "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", False, "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", False, "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "STORAGE", "*", "*", "*", False, "*", "*", "*", "*", "*"),
# PSA_ACK IPC (FF) does not support LVL3
- ("*", "*", "*", "3", "*", "IPC", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "3", "*", "IPC", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# Musca requires BL2
- ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_s1", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_s1", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
# psoc64 cannot use BL2
- ("cypress/psoc64", "*", "*", "*", "*", "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*"),
+ ("cypress/psoc64", "*", "*", "*", "*", "*", "*", "*", True, "*", "*", "*", "*", "*", "*"),
# psoc64 does not support Debug build type
- ("cypress/psoc64", "*", "*", "*", "*", "*", "Debug", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("cypress/psoc64", "*", "*", "*", "*", "*", "Debug", "*", "*", "*", "*", "*", "*", "*", "*"),
# Musca b1 SSE 200 does not support Profile S
- ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
# 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", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("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
- ("arm/musca_b1/secure_enclave", "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "IPC", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "STORAGE", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", True, "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "IPC", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "CRYPTO", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "INITIAL_ATTESTATION", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "STORAGE", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "*", "*", "*", "*", "*", "*", True, "*", "*", "*", "*", "*"),
# PARTITION_PS could be OFF only for Profile S and M
- ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "", "OFF", "*", "*", "*", "*"),
- ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "OFF", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "", "OFF", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "OFF", "*", "*", "*"),
# PARTITION_PS should be OFF for Profile S
- ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "ON", "*", "*", "*", "*"),
+ ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "ON", "*", "*", "*"),
# Proile M only support for IPC model
- ("*", "*", True, "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
+ ("*", "*", True, "*", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
# Profile M only support for Isolation Level 2
- ("*", "*", "*", "1", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "3", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "1", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
+ ("*", "*", "*", "3", "*", "*", "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
# Profile L only support for Isolation Level 3
- ("*", "*", "*", "1", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "2", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "1", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*"),
+ ("*", "*", "*", "2", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*"),
# Profile S does not support IPC model
- ("*", "*", False, "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
+ ("*", "*", False, "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
# Profile S only supports Isolation Level 1
- ("*", "*", "*", "2", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
- ("*", "*", "*", "3", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
+ ("*", "*", "*", "2", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
+ ("*", "*", "*", "3", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
# Only AN521 and MUSCA_B1 support Isolation Level 3
- ("arm/mps2/an519", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/mps3/an524", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_s1", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("cypress/psoc64", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_b1/secure_enclave", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/mps2/an519", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/mps3/an524", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_s1", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("cypress/psoc64", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/secure_enclave", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# stm/stm32l562e_dk uses BL2
- ("stm/stm32l562e_dk", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*", "*"),
+ ("stm/stm32l562e_dk", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*", "*", "*"),
# stm/stm32l562e_dk does not support Debug build type
- ("stm/stm32l562e_dk", "*", "*", "*", "*", "*", "Debug", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("stm/stm32l562e_dk", "*", "*", "*", "*", "*", "Debug", "*", "*", "*", "*", "*", "*", "*", "*"),
# nxp/lpcxpresso55s69 only build with GCC
- ("nxp/lpcxpresso55s69", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("nxp/lpcxpresso55s69", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
# nxp/lpcxpresso55s69 only build Profile M
- ("nxp/lpcxpresso55s69", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
- ("nxp/lpcxpresso55s69", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*", "*"),
+ ("nxp/lpcxpresso55s69", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
+ ("nxp/lpcxpresso55s69", "*", "*", "*", "*", "*", "*", "*", "*", "*", "profile_large", "*", "*", "*", "*"),
# nxp/lpcxpresso55s69 have to turn off BL2 when build regression test
- ("nxp/lpcxpresso55s69", "*", "*", "*", True, "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*"),
+ ("nxp/lpcxpresso55s69", "*", "*", "*", True, "*", "*", "*", True, "*", "*", "*", "*", "*", "*"),
# nxp/lpcxpresso55s69 turn off BL2 temporary, due to the oversize error
- ("nxp/lpcxpresso55s69", "*", "*", "*", "*", "*", "*", "*", True, "*", "*", "*", "*", "*", "*", "*"),
+ ("nxp/lpcxpresso55s69", "*", "*", "*", "*", "*", "*", "*", True, "*", "*", "*", "*", "*", "*"),
# FP support only for GCC
- ("*", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "1", "*", "*"),
- ("*", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "2", "*", "*"),
+ ("*", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "1", "*", "*"),
+ ("*", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "2", "*", "*"),
# FP soft only build for lazy stacking disabled
- ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "0", "ON", "*")
+ ("*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "*", "0", "ON", "*")
]
# Configure build manager to build several combinations
@@ -260,7 +258,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -283,7 +280,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -309,7 +305,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -333,7 +328,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -358,7 +352,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -381,7 +374,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -404,7 +396,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -427,7 +418,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": ["CRYPTO_OFF", "NS_ATTEST_ON"]
@@ -449,7 +439,6 @@
"with_ns": [True],
"profile": ["profile_medium"],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -472,7 +461,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0", "1", "2"],
"lazy": ["ON", "OFF"],
"extra_params": [""]
@@ -494,7 +482,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -517,7 +504,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -541,7 +527,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -569,7 +554,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -577,17 +561,17 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("cypress/psoc64", "*", "*", "*", "*", "*", "Debug", "*",
- "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*"),
("cypress/psoc64", "*", "*", "*", "*", "*", "*", "*", True,
- True, "*", "*", "*", "*", "*", "*"),
+ True, "*", "*", "*", "*", "*"),
("arm/mps2/an521", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/mps2/an519", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/mps3/an524", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -606,7 +590,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -629,7 +612,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -637,7 +619,7 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -656,7 +638,6 @@
"with_ns": [True],
"profile": ["profile_small", "profile_medium", "profile_large"],
"partition_ps": ["ON", "OFF"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -664,12 +645,12 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
# Profile Large is only supported by AN521
("arm/mps2/an519", "*", "*", "*", "*", "*", "*", "*", "*",
- "*", "profile_large", "*", "*", "*", "*", "*"),
+ "*", "profile_large", "*", "*", "*", "*"),
("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*",
- "*", "*", "profile_large", "*", "*", "*", "*", "*"),
+ "*", "*", "profile_large", "*", "*", "*", "*"),
]
}
@@ -687,7 +668,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -710,7 +690,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -733,7 +712,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -756,7 +734,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -781,7 +758,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -789,7 +765,7 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -812,7 +788,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -820,7 +795,7 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -839,7 +814,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -847,7 +821,7 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -867,7 +841,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -875,21 +848,21 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
("cypress/psoc64", "*", "*", "*", "*", "*", "Debug", "*",
- "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*"),
("cypress/psoc64", "*", "*", "*", "*", "*", "*", "*", True,
- True, "*", "*", "*", "*", "*", "*"),
+ True, "*", "*", "*", "*", "*"),
("arm/mps2/an521", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/mps2/an519", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/musca_b1/sse_200", "*", "*", "*", "*", "*",
- "RelWithDebInfo", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "RelWithDebInfo", "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/musca_s1", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/mps3/an524", "*", "*", "*", "*", "*", "RelWithDebInfo",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -907,7 +880,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": ["NSCE"]
@@ -930,10 +902,9 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["ON"],
"fp": ["0"],
"lazy": ["OFF"],
- "extra_params": [""]
+ "extra_params": ["MMIO"]
},
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + []
@@ -954,7 +925,6 @@
"with_ns": [True],
"profile": ["profile_small", "profile_medium", "profile_large"],
"partition_ps": ["ON", "OFF"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -962,12 +932,12 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "toolchain_GNUARM.cmake", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "Minsizerel", "*", "*", "*", "*", "*", "*", "*", "*"),
# Profile Large is only supported by AN521
("arm/mps2/an519", "*", "*", "*", "*", "*", "*", "*", "*",
- "*", "profile_large", "*", "*", "*", "*", "*"),
+ "*", "profile_large", "*", "*", "*", "*"),
("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*",
- "*", "*", "profile_large", "*", "*", "*", "*", "*"),
+ "*", "*", "profile_large", "*", "*", "*", "*"),
]
}
@@ -988,7 +958,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1012,7 +981,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1035,7 +1003,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1058,7 +1025,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1081,7 +1047,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": ["CRYPTO_OFF", "NS_ATTEST_ON"]
@@ -1103,7 +1068,6 @@
"with_ns": [True],
"profile": ["profile_medium"],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1126,7 +1090,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0", "2"],
"lazy": ["ON", "OFF"],
"extra_params": [""]
@@ -1150,7 +1113,6 @@
"with_ns": [True, False],
"profile": ["", "profile_small", "profile_medium"],
"partition_ps": ["ON", "OFF"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1159,75 +1121,75 @@
"valid": [
("arm/mps2/an521", "toolchain_GNUARM.cmake",
True, "1", False, "OFF", "Debug",
- "off", True, True, "", "ON", "OFF", "0", "OFF", ""),
+ "off", True, True, "", "ON", "0", "OFF", ""),
("arm/mps2/an521", "toolchain_ARMCLANG.cmake",
False, "2", False, "OFF", "Debug",
- "off", True, True, "", "ON", "OFF", "0", "OFF", ""),
+ "off", True, True, "", "ON", "0", "OFF", ""),
("arm/mps2/an521", "toolchain_ARMCLANG.cmake",
False, "3", False, "OFF", "Release",
- "off", True, True, "", "ON", "OFF", "0", "OFF", ""),
+ "off", True, True, "", "ON", "0", "OFF", ""),
("arm/mps2/an521", "toolchain_GNUARM.cmake",
False, "2", False, "OFF", "Debug",
- "off", True, True, "profile_medium", "ON", "OFF", "0", "OFF", ""),
+ "off", True, True, "profile_medium", "ON", "0", "OFF", ""),
("arm/mps2/an521", "toolchain_GNUARM.cmake",
False, "3", False, "OFF", "Debug",
- "off", True, True, "profile_large", "ON", "OFF", "0", "OFF", ""),
+ "off", True, True, "profile_large", "ON", "0", "OFF", ""),
# 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", "OFF", "0", "OFF", ""),
+ "off", True, True, "profile_medium", "OFF", "0", "OFF", ""),
# 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", "OFF", "0", "OFF", ""),
+ "off", True, True, "", "ON", "0", "OFF", ""),
# stm32l562e_dk_ARMCLANG_IPC_1_REG_Release_BL2_NS
("stm/stm32l562e_dk", "toolchain_ARMCLANG.cmake",
False, "1", True, "OFF", "Release",
- "off", True, True, "", "ON", "OFF", "0", "OFF", "CRYPTO_OFF"),
+ "off", True, True, "", "ON", "0", "OFF", "CRYPTO_OFF"),
# stm32l562e_dk_GNUARM_IPC_2_REG_Release_BL2_NS
("stm/stm32l562e_dk", "toolchain_GNUARM.cmake",
False, "2", True, "OFF", "Release",
- "off", True, True, "", "ON", "OFF", "0", "OFF", "NS_ATTEST_ON"),
+ "off", True, True, "", "ON", "0", "OFF", "NS_ATTEST_ON"),
# stm32l562e_dk_GNUARM_IPC_3_REG_Release_BL2_NS
("stm/stm32l562e_dk", "toolchain_GNUARM.cmake",
False, "3", True, "OFF", "Release",
- "off", True, True, "", "ON", "OFF", "0", "OFF", "CRYPTO_OFF"),
+ "off", True, True, "", "ON", "0", "OFF", "CRYPTO_OFF"),
# MUSCA_S1_GNUARM_IPC_2_REG_Release_BL2_NS_SFP2_SLAZY
("arm/musca_s1", "toolchain_GNUARM.cmake",
False, "2", True, "OFF", "Release",
- "off", True, True, "", "ON", "OFF", "2", "ON", ""),
+ "off", True, True, "", "ON", "2", "ON", ""),
],
"invalid": _common_tfm_invalid_configs + [
# invalid configs that are not supported by TF-M
("arm/musca_s1", "*", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
# valid configs supported by TF-M but not needed in per-patch
("*", "*", "*", "1", "*", "*", "Release",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "1", "*", "*", "Minsizerel",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "2", "*", "*", "Debug",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "2", "*", "*", "Minsizerel",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "3", "*", "*", "Debug",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("*", "*", "*", "3", "*", "*", "Release",
- "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*"),
("arm/mps2/an519", "*", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
("arm/musca_s1", "*", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
("arm/mps2/an519", "*", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
("arm/mps2/an521", "*", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
("*", "toolchain_GNUARM.cmake", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_small", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_small", "*", "*", "*", "*"),
("*", "toolchain_ARMCLANG.cmake", "*", "*", "*", "*",
- "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "profile_medium", "*", "*", "*", "*"),
("*", "toolchain_ARMCLANG.cmake", True, "*", "*", "*",
- "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*", "*"),
]
}
@@ -1244,7 +1206,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1270,7 +1231,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1292,7 +1252,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1314,7 +1273,6 @@
"with_ns": [True],
"profile": ["", "profile_small", "profile_medium"],
"partition_ps": ["ON", "OFF"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1336,7 +1294,6 @@
"with_ns": [True],
"profile": ["", "profile_small", "profile_medium", "profile_large"],
"partition_ps": ["ON", "OFF"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1375,7 +1332,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1399,7 +1355,6 @@
"with_ns": [True],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1407,9 +1362,9 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("*", "toolchain_ARMCLANG.cmake", False, "*", "*", "*",
- "*", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", "*", "*", "*", "*", "*", "*", "*"),
("*", "toolchain_ARMCLANG.cmake", True, "1", "*", "*",
- "*", "*", False, "*", "*", "*", "*", "*", "*", "*"),
+ "*", "*", False, "*", "*", "*", "*", "*", "*"),
]
}
@@ -1426,7 +1381,6 @@
"with_ns": [True, False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1434,7 +1388,7 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an521", "toolchain_GNUARM.cmake", False, "2", "*", "*",
- "*", "*", True, "*", "*", "*", "*", "*", "*", "*")
+ "*", "*", True, "*", "*", "*", "*", "*", "*")
]
}
@@ -1451,7 +1405,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1473,7 +1426,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1495,7 +1447,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1517,7 +1468,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1539,7 +1489,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1561,7 +1510,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1583,7 +1531,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1605,7 +1552,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
@@ -1627,7 +1573,6 @@
"with_ns": [False],
"profile": [""],
"partition_ps": ["ON"],
- "mmio": ["OFF"],
"fp": ["0"],
"lazy": ["OFF"],
"extra_params": [""]
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index dc2be67..7275866 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -86,7 +86,8 @@
"-DTEST_S_T_COSE=OFF "
"-DTEST_NS_PS=OFF "
"-DTEST_S_PS=OFF "),
- "NSCE": "-DTFM_NS_MANAGE_NSID=ON "}
+ "NSCE": "-DTFM_NS_MANAGE_NSID=ON ",
+ "MMIO": "-DPSA_FRAMEWORK_HAS_MM_IOVEC=ON "}
class TFM_Build_Manager(structuredTask):
""" Class that will load a configuration out of a json file, schedule
@@ -158,7 +159,6 @@
"NS={}",
"PROFILE={}",
"PARTITION_PS={}",
- "MMIO={}",
"FP={}",
"LAZY={}",
"EXTRA_PARAMS={}"
@@ -179,7 +179,6 @@
config_details.with_ns,
"N.A" if not config_details.profile else config_details.profile,
config_details.partition_ps,
- config_details.mmio,
config_details.fp,
config_details.lazy,
"N.A" if not config_details.extra_params else config_details.extra_params,
@@ -441,7 +440,6 @@
"with_ns": i.with_ns,
"profile": "" if i.profile=="N.A" else i.profile,
"partition_ps": i.partition_ps,
- "mmio": i.mmio,
"fp": i.fp,
"lazy": i.lazy,
"extra_params": mapExtraParams[i.extra_params]}
@@ -633,14 +631,12 @@
config_param.append(mapProfile[list(i)[10]])
if list(i)[11] == "OFF": #PARTITION_PS
config_param.append("PSOFF")
- if list(i)[12] == "ON":
- config_param.append("MMIO")
- if list(i)[13] == "1" or list(i)[13] == "2":
- config_param.append(mapSFPOption[list(i)[13]]) #FP
- if list(i)[14] == "ON": # LAZY
+ if list(i)[12] == "1" or list(i)[12] == "2":
+ config_param.append(mapSFPOption[list(i)[12]]) #FP
+ if list(i)[13] == "ON": # LAZY
config_param.append("SLAZY")
- if list(i)[15]: # EXTRA_PARAMS
- config_param.append(list(i)[15])
+ if list(i)[14]: # EXTRA_PARAMS
+ config_param.append(list(i)[14])
i_str = "_".join(config_param)
ret_cfg[i_str] = i
return ret_cfg