Remove OTP configs in Open CI
Specific OTP tests are no more needed in Open CI now
because MUSCA B1 is also using flash backend.
OTP can be covered by common configs.
This patch removes all OTP related configs in Open CI.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I67f9037406796de8037f9e324844bc21ef5340fb
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 79a6993..8140c20 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -39,7 +39,6 @@
"test_regression",
"test_psa_api",
"cmake_build_type",
- "with_otp",
"with_bl2",
"with_ns",
"profile",
@@ -61,7 +60,6 @@
"-DBL2=%(with_bl2)s " + \
"-DNS=%(with_ns)s " + \
"-DTFM_PROFILE=%(profile)s " + \
- "-DCRYPTO_HW_ACCELERATOR_OTP_STATE=%(with_otp)s " + \
"-DTFM_PARTITION_PROTECTED_STORAGE=%(partition_ps)s " + \
"%(extra_params)s " + \
"-DTFM_TEST_REPO_PATH=%(codebase_root_dir)s/../tf-m-tests " + \
@@ -165,25 +163,25 @@
# List of all build configs that are impossible under all circumstances
_common_tfm_invalid_configs = [
# GCC defect
- ("arm/mps2/an519", "GCC_7_3_1", "*", "*", "*", "*", "Minsizerel", "*", "*", "*", "*", "*", "*"),
+ ("arm/mps2/an519", "GCC_7_3_1", "*", "*", "*", "*", "Minsizerel", "*", "*", "*", "*", "*"),
# LR_CODE size exceeds limit on MUSCA_B1 & MUSCA_S1 with regression tests in Debug mode built with ARMCLANG
- ("arm/musca_b1/sse_200", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "*", "*", "", "*", "*"),
- ("arm/musca_s1", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "*", "*", "", "*", "*"),
+ ("arm/musca_b1/sse_200", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "*", "", "*", "*"),
+ ("arm/musca_s1", "ARMCLANG_6_13", "*", "*", True, "OFF", "Debug", "*", "*", "", "*", "*"),
# Load range overlap on Musca for IPC Debug type: T895
- ("arm/musca_b1/sse_200", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_s1", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_b1/sse_200", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*"),
+ ("arm/musca_s1", "ARMCLANG_6_13", "*", "*", "*", "IPC", "Debug", "*", "*", "*", "*", "*"),
# LVL2 and LVL3 requires IPC model
- ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("*", "*", True, "3", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", True, "2", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("*", "*", True, "3", "*", "*", "*", "*", "*", "*", "*", "*"),
# Regression requires NS
- ("*", "*", "*", "*", True, "*", "*", "*", "*", False, "*", "*", "*"),
+ ("*", "*", "*", "*", True, "*", "*", "*", False, "*", "*", "*"),
# Musca requires BL2
- ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*"),
- ("arm/musca_s1", "*", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*"),
+ ("arm/musca_b1/sse_200", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*"),
+ ("arm/musca_s1", "*", "*", "*", "*", "*", "*", False, "*", "*", "*", "*"),
# Only AN521 and MUSCA_B1 support Isolation Level 3
- ("arm/mps2/an519", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/mps3/an524", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
- ("arm/musca_s1", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/mps2/an519", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/mps3/an524", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
+ ("arm/musca_s1", "*", "*", "3", "*", "*", "*", "*", "*", "*", "*", "*"),
]
# Configure build manager to build several combinations
@@ -197,7 +195,6 @@
"test_regression": [True],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -208,98 +205,95 @@
"valid": [
# AN519_ARMCLANG_IPC_2_REG_Release_BL2_NS
("arm/mps2/an519", "ARMCLANG_6_13", False, "2", True,
- "OFF", "Release", "off", True, True, "", "ON", ""),
+ "OFF", "Release", True, True, "", "ON", ""),
# AN519_GCC_IPC_1_REG_Debug_BL2_NS
("arm/mps2/an519", "GCC_7_3_1", False, "1", True,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN519_GCC_IPC_2_REG_Release_BL2_NS
("arm/mps2/an519", "GCC_7_3_1", False, "2", True,
- "OFF", "Release", "off", True, True, "", "ON", ""),
+ "OFF", "Release", True, True, "", "ON", ""),
# AN519_GCC_LIB_1_REG_Debug_BL2_NS
("arm/mps2/an519", "GCC_7_3_1", True, "1", True,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN521_ARMCLANG_IPC_1_REG_Debug_BL2_NS
("arm/mps2/an521", "ARMCLANG_6_13", False, "1", True,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN521_ARMCLANG_IPC_2_Debug_BL2_NS
("arm/mps2/an521", "ARMCLANG_6_13", False, "2", False,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN521_ARMCLANG_IPC_2_REG_Release_BL2_NS
("arm/mps2/an521", "ARMCLANG_6_13", False, "2", True,
- "OFF", "Release", "off", True, True, "", "ON", ""),
+ "OFF", "Release", True, True, "", "ON", ""),
# AN521_ARMCLANG_IPC_3_REG_Minsizerel_BL2_NS
("arm/mps2/an521", "ARMCLANG_6_13", False, "3", True,
- "OFF", "Minsizerel", "off", True, True, "", "ON", ""),
+ "OFF", "Minsizerel", True, True, "", "ON", ""),
# AN521_ARMCLANG_IPC_3_Release_BL2_NS
("arm/mps2/an521", "ARMCLANG_6_13", False, "3", False,
- "OFF", "Release", "off", True, True, "", "ON", ""),
+ "OFF", "Release", True, True, "", "ON", ""),
# AN521_GCC_IPC_1_REG_Debug_BL2_NS
("arm/mps2/an521", "GCC_7_3_1", False, "1", True,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN521_GCC_IPC_2_Debug_BL2_NS_MEDIUM
("arm/mps2/an521", "GCC_7_3_1", False, "2", False, "OFF",
- "Debug", "off", True, True, "profile_medium", "ON", ""),
+ "Debug", True, True, "profile_medium", "ON", ""),
# AN521_GCC_IPC_2_REG_Release_BL2_NS
("arm/mps2/an521", "GCC_7_3_1", False, "2", True,
- "OFF", "Release", "off", True, True, "", "ON", ""),
+ "OFF", "Release", True, True, "", "ON", ""),
# AN521_GCC_IPC_3_Debug_BL2_NS_LARGE
("arm/mps2/an521", "GCC_7_3_1", False, "3", False, "OFF",
- "Debug", "off", True, True, "profile_large", "ON", ""),
+ "Debug", True, True, "profile_large", "ON", ""),
# AN521_GCC_IPC_3_REG_Minsizerel_BL2_NS
("arm/mps2/an521", "GCC_7_3_1", False, "3", True,
- "OFF", "Minsizerel", "off", True, True, "", "ON", ""),
+ "OFF", "Minsizerel", True, True, "", "ON", ""),
# AN521_GCC_LIB_1_Debug_BL2_NS
("arm/mps2/an521", "GCC_7_3_1", True, "1", False,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN521_GCC_LIB_1_REG_Debug_BL2_NS
("arm/mps2/an521", "GCC_7_3_1", True, "1", True,
- "OFF", "Debug", "off", True, True, "", "ON", ""),
+ "OFF", "Debug", True, True, "", "ON", ""),
# AN521_GCC_IPC_2_REG_Release_BL2_NS_MEDIUM_PSOFF
("arm/mps2/an521", "GCC_7_3_1",
False, "2", True, "OFF", "Release",
- "off", True, True, "profile_medium", "OFF", ""),
+ True, True, "profile_medium", "OFF", ""),
# AN552_GNUARM_IPC_1_REG_Debug_BL2_NS
("arm/mps3/an552", "GCC_10_3", False, "1", True, "OFF",
- "Debug", "off", True, True, "", "ON", ""),
+ "Debug", True, True, "", "ON", ""),
# AN552_GNUARM_IPC_1_REG_Release_BL2_NS
("arm/mps3/an552", "GCC_10_3", False, "1", True, "OFF",
- "Release", "off", True, True, "", "ON", ""),
- # MUSCA_B1_GCC_IPC_2_REG_Release_OTP_BL2_NS
- ("arm/musca_b1/sse_200", "GCC_7_3_1", False, "2", True,
- "OFF", "Release", "ENABLED", True, True, "", "ON", ""),
+ "Release", True, True, "", "ON", ""),
# MUSCA_B1_GCC_LIB_1_REG_Minsizerel_BL2_NS
("arm/musca_b1/sse_200", "GCC_7_3_1", True, "1", True,
- "OFF", "Minsizerel", "off", True, True, "", "ON", ""),
+ "OFF", "Minsizerel", True, True, "", "ON", ""),
# MUSCA_S1_ARMCLANG_IPC_2_REG_Release_BL2_NS
("arm/musca_s1", "ARMCLANG_6_13", False, "2", True, "OFF",
- "Release", "off", True, True, "", "ON", ""),
+ "Release", True, True, "", "ON", ""),
# MUSCA_S1_GCC_IPC_1_REG_Debug_BL2_NS
("arm/musca_s1", "GCC_10_3", False, "1", True, "OFF",
- "Debug", "off", True, True, "", "ON", ""),
+ "Debug", True, True, "", "ON", ""),
# MUSCA_S1_GCC_IPC_2_REG_Release_BL2_NS
("arm/musca_s1", "GCC_10_3", False, "2", True, "OFF",
- "Release", "off", True, True, "", "ON", ""),
+ "Release", True, True, "", "ON", ""),
# MUSCA_S1_GCC_LIB_1_REG_Debug_BL2_NS
("arm/musca_s1", "GCC_10_3", True, "1", True, "OFF",
- "Debug", "off", True, True, "", "ON", ""),
+ "Debug", True, True, "", "ON", ""),
# MUSCA_S1_GCC_IPC_2_REG_Release_BL2_NS_FPHARD
("arm/musca_s1", "GCC_10_3", False, "2", True, "OFF",
- "Release", "off", True, True, "", "ON", "FPHARD"),
+ "Release", True, True, "", "ON", "FPHARD"),
# MUSCA_S1_GCC_IPC_1_REG_Release_BL2_NS_CC_DRIVER_PSA
("arm/musca_s1", "GCC_7_3_1", False, "1", True, "OFF",
- "Release", "off", True, True, "", "ON", "CC_DRIVER_PSA"),
+ "Release", True, True, "", "ON", "CC_DRIVER_PSA"),
# stm32l562e_dk_ARMCLANG_IPC_1_REG_Release_BL2_NS
("stm/stm32l562e_dk", "ARMCLANG_6_13", False, "1", True,
- "OFF", "Release", "off", True, True, "", "ON", "CRYPTO_OFF"),
+ "OFF", "Release", True, True, "", "ON", "CRYPTO_OFF"),
# stm32l562e_dk_GCC_IPC_2_REG_Release_BL2_NS
("stm/stm32l562e_dk", "GCC_7_3_1", False, "2", False, "OFF",
- "Release", "off", True, True, "", "ON", "CRYPTO_ON"),
+ "Release", True, True, "", "ON", "CRYPTO_ON"),
# stm32l562e_dk_GCC_IPC_3_REG_Release_BL2_NS
("stm/stm32l562e_dk", "GCC_7_3_1", False, "3", True, "OFF",
- "Release", "off", True, True, "", "ON", "CRYPTO_OFF"),
+ "Release", True, True, "", "ON", "CRYPTO_OFF"),
# psoc64_GCC_IPC_2_REG_Release_NS
("cypress/psoc64", "GCC_7_3_1", False, "2", True, "OFF",
- "Release", "off", False, True, "", "ON", ""),
+ "Release", False, True, "", "ON", ""),
],
"invalid": _common_tfm_invalid_configs + []
}
@@ -317,7 +311,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -341,7 +334,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -354,7 +346,7 @@
# AN521_GCC_IPC_3_REG_Relwithdebinfo_BL2_NS
("arm/mps2/an521", "GCC_11_2",
False, "3", True, "OFF", "Relwithdebinfo",
- "off", True, True, "", "ON", ""),
+ True, True, "", "ON", ""),
],
"invalid": _common_tfm_invalid_configs + []
}
@@ -368,7 +360,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["OFF"],
"with_bl2": [True],
"with_ns": [True],
"profile": ["profile_small"],
@@ -378,12 +369,12 @@
"common_params": _common_tfm_builder_cfg,
"valid": [
# Profile Small also supports SFN model
- ("*", "*", False, "*", "*", "*", "*", "*", "*", "*", "*",
+ ("*", "*", False, "*", "*", "*", "*", "*", "*", "*",
"*", "SFN_ENABLE")
],
"invalid": _common_tfm_invalid_configs + [
("arm/mps2/an519", "GCC_7_3_1", "*", "*", "*",
- "*", "Minsizerel", "*", "*", "*", "*", "*", "*")
+ "*", "Minsizerel", "*", "*", "*", "*", "*")
]
}
@@ -397,7 +388,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": ["profile_medium"],
@@ -416,7 +406,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": ["profile_large"],
@@ -436,7 +425,6 @@
"test_regression": [True],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -455,7 +443,6 @@
"test_regression": [True],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -479,7 +466,6 @@
"INITIAL_ATTESTATION",
"STORAGE"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -489,33 +475,14 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
# FF does not support library model
- ("*", "*", True, "*", "*", "IPC", "*",
+ ("*", "*", True, "*", "*", "IPC",
"*", "*", "*", "*", "*", "*"),
# FF does not support L3
- ("*", "*", "*", "3", "*", "IPC", "*",
+ ("*", "*", "*", "3", "*", "IPC",
"*", "*", "*", "*", "*", "*"),
]
}
-config_otp = {"seed_params": {
- "tfm_platform": ["arm/musca_b1/sse_200"],
- "compiler": ["GCC_7_3_1", "ARMCLANG_6_13"],
- "lib_model": [True, False],
- "isolation_level": ["1", "2", "3"],
- "test_regression": [True],
- "test_psa_api": ["OFF"],
- "cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["ENABLED"],
- "with_bl2": [True],
- "with_ns": [True],
- "profile": [""],
- "partition_ps": ["ON"],
- "extra_params": [""]
- },
- "common_params": _common_tfm_builder_cfg,
- "invalid": _common_tfm_invalid_configs + []
- }
-
config_nsce = {"seed_params": {
"tfm_platform": ["arm/mps2/an521"],
"compiler": ["GCC_7_3_1", "ARMCLANG_6_13"],
@@ -524,7 +491,6 @@
"test_regression": [True],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -543,7 +509,6 @@
"test_regression": [True],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -579,7 +544,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True, False],
"with_ns": [True, False],
"profile": [""],
@@ -598,7 +562,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True, False],
"with_ns": [True, False],
"profile": [""],
@@ -617,7 +580,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True, False],
"with_ns": [True, False],
"profile": [""],
@@ -636,7 +598,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -655,7 +616,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -674,7 +634,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True, False],
"profile": [""],
@@ -693,7 +652,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -712,7 +670,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True, False],
"profile": [""],
@@ -731,7 +688,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -750,7 +706,6 @@
"test_regression": [True],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
- "with_otp": ["off"],
"with_bl2": [False],
"with_ns": [True],
"profile": [""],
@@ -769,7 +724,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -788,7 +742,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -799,12 +752,12 @@
"invalid": _common_tfm_invalid_configs + [
# Oversize issue on config stm32l562e_dk_ARMCLANG_LIB_1_REG_Release_BL2_NS
("stm/stm32l562e_dk", "ARMCLANG_6_13", True, "1", True,
- "OFF", "Release", "off", True, True, "", "ON", "*"),
+ "OFF", "Release", True, True, "", "ON", "*"),
# all other tests are off when CRYPTO is ON
- ("stm/stm32l562e_dk", "*", "*", "*", True, "*", "*", "*",
+ ("stm/stm32l562e_dk", "*", "*", "*", True, "*", "*",
"*", "*", "*", "*", "CRYPTO_ON"),
# all other tests are ON when CRYPTO is OFF
- ("stm/stm32l562e_dk", "*", "*", "*", False, "*", "*", "*",
+ ("stm/stm32l562e_dk", "*", "*", "*", False, "*", "*",
"*", "*", "*", "*", "CRYPTO_OFF"),
]
}
@@ -817,7 +770,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -836,7 +788,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -855,7 +806,6 @@
"test_regression": [True, False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Relwithdebinfo"],
- "with_otp": ["off"],
"with_bl2": [False],
"with_ns": [True],
"profile": ["profile_medium"],
@@ -874,7 +824,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -893,7 +842,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -912,7 +860,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -931,7 +878,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -950,7 +896,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [False],
"profile": [""],
@@ -970,7 +915,6 @@
"test_regression": [False],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -995,7 +939,6 @@
"STORAGE",
"IPC"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -1017,7 +960,6 @@
"STORAGE",
"IPC"],
"cmake_build_type": ["Debug"],
- "with_otp": ["off"],
"with_bl2": [True],
"with_ns": [True],
"profile": [""],
@@ -1041,7 +983,6 @@
"nightly_cc_driver_psa": config_cc_driver_psa,
"nightly_fp":config_fp,
"nightly_psa_api": config_psa_api,
- "nightly_otp": config_otp,
"nightly_nsce": config_nsce,
"nightly_mmio": config_mmio,
"nightly_an547": config_an547,
@@ -1061,7 +1002,6 @@
"release_cc_driver_psa": config_cc_driver_psa,
"release_fp": config_fp,
"release_psa_api": config_psa_api,
- "release_otp": config_otp,
"release_nsce": config_nsce,
"release_mmio": config_mmio,
"release_an547": config_an547,
diff --git a/jenkins/ci.jpl b/jenkins/ci.jpl
index 21c5c9a..f2e897d 100644
--- a/jenkins/ci.jpl
+++ b/jenkins/ci.jpl
@@ -91,14 +91,8 @@
@NonCPS
def generateLavaParam(build_params) {
def params = []
- if (build_params["TFM_PLATFORM"] == "arm/musca_b1/sse_200" && \
- build_params["OTP"] == "ENABLED") {
- params += string(name: "TARGET_PLATFORM", value: "MUSCA_B1_OTP")
- }
- else {
- params += string(name: "TARGET_PLATFORM", \
- value: mapPlatform[build_params["TFM_PLATFORM"]])
- }
+ params += string(name: "TARGET_PLATFORM", \
+ value: mapPlatform[build_params["TFM_PLATFORM"]])
params += string(name: "COMPILER", \
value: build_params["COMPILER"].split('_')[0])
params += string(name: "PSA_API_SUITE", \
@@ -245,15 +239,6 @@
env.JOB_NAME.equals("tf-m-build-and-test")) {
print("LAVA is not needed for ${build_url}")
}
- // Only submit LAVA test for a specified OTP enabled config in nightly or release job
- else if (params_collection["OTP"] == "ENABLED" && \
- params_collection["CONFIG_NAME"] != "MUSCA_B1_GCC_PSA_3_REG_Debug_OTP_BL2_NS") {
- print("LAVA is not needed for ${build_url}")
- }
- else if (params_collection["CONFIG_NAME"] == "MUSCA_B1_GCC_PSA_3_REG_Debug_OTP_BL2_NS" && \
- !(env.JOB_NAME.equals("tf-m-nightly") || env.JOB_NAME.equals("tf-m-release"))) {
- print("LAVA is not needed for ${build_url}")
- }
// Submit LAVA tests
else {
submit_lava_tests(config, results, build_res, params, params_collection)
@@ -359,19 +344,12 @@
result.value[2]['ISOLATION_LEVEL'], \
result.value[2]['TEST_REGRESSION'], \
result.value[2]['TEST_PSA_API'], \
- result.value[2]['PROFILE'], \
- result.value[2]['PARTITION_PS'], \
- result.value[2]['OTP']])
+ result.value[2]['PROFILE']])
}
}
resultsParam.each { result ->
- if (result[2] == 'arm/musca_b1/sse_200') {
- if (result[13] != 'off') {
- result[2] = 'arm/musca_b1/sse_200_OTP'
- }
- }
result[3] = result[3].split('_')[0]
- build_params = result[7..12]
+ build_params = result[7..11]
configName = ""
for (map_cfg in mapConfigs) {
if (build_params[0..4] == map_cfg[0..4]) {
@@ -393,7 +371,7 @@
resultsParam.each { result ->
current_row = result[2..4]
cfgs.each {cfg ->
- if (cfg == result[14]) {
+ if (cfg == result[12]) {
current_row.add(cfg)
current_row.add(result[1])
}
diff --git a/lava_helper/jinja2_templates/musca_b1_otp.jinja2 b/lava_helper/jinja2_templates/musca_b1_otp.jinja2
deleted file mode 100644
index c445b24..0000000
--- a/lava_helper/jinja2_templates/musca_b1_otp.jinja2
+++ /dev/null
@@ -1,50 +0,0 @@
-{#------------------------------------------------------------------------------
-# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-#-----------------------------------------------------------------------------#}
-{% extends 'jinja2_templates/base.jinja2' %}
-{% block actions %}
-actions:
- - deploy:
- timeout:
- minutes: 12
- to: musca
- images:
- test_binary:
- url: {{ firmware_url }}
-
- - boot:
- method: musca
-
- - test:
- monitors:
- {%- for monitor in test.monitors %}
- - name: "{{monitor.name}}"
- start: "{{monitor.start}}"
- end: "{{monitor.end}}"
- pattern: "{{monitor.pattern}}"
- fixupdict:
- '{{monitor.fixup.pass}}': pass
- '{{monitor.fixup.fail}}': fail
- {%- if monitor.fixup.skip %}
- '{{monitor.fixup.skip}}': skip
- {%- endif %}
- {% endfor %}
-
-tags:
- - otp
-{% endblock %}
-
-{% block metadata %}
-metadata:
- build_no: {{ build_no }}
- compiler: {{ compiler }}
- build_type: {{ build_type }}
- boot_type: {{ boot_type }}
- name: {{ name }}
- platform: {{ platform }}
- build_name: {{ build_name }}
- build_job_url: {{ build_job_url }}
-{% endblock %}
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 5decd34..6dfe7ce 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -606,31 +606,6 @@
},
}
-# Musca-B1 with BL2 bootloader and OTP enabled
-# unified hex file comprising of both bl2.bin and tfm_s_ns_signed.bin
-# srec_cat bin/bl2.bin -Binary -offset 0xA000000 bin/tfm_s_ns_signed.bin -Binary -offset 0xA020000 -o tfm.hex -Intel
-musca_b1_otp_bl2 = {
- "templ": "musca_b1_otp.jinja2",
- "job_name": "musca_b1_opt_bl2",
- "device_type": "musca-b",
- "job_timeout": 40,
- "action_timeout": 20,
- "monitor_timeout": 30,
- "poweroff_timeout": 40,
- "platforms": {"MUSCA_B1_OTP": ""},
- "compilers": ["GCC"],
- "build_types": ["Debug"],
- "boot_types": ["BL2"],
- "binaries": {
- "firmware": "tfm.hex",
- },
- "tests": {
- "RegressionIPCTfmLevel3": {
- "monitors": monitors_reg_tests
- },
- },
-}
-
# STM32L562E-DK
stm32l562e_dk = {
"templ": "stm32l562e_dk.jinja2",
@@ -732,7 +707,6 @@
"fvp_mps2_an519_nobl2": fvp_mps2_an519_nobl2,
"qemu_mps2_bl2": qemu_mps2_bl2,
"musca_b1": musca_b1_bl2,
- "musca_b1_otp": musca_b1_otp_bl2,
"stm32l562e_dk": stm32l562e_dk,
"lpcxpresso55s69": lpcxpresso55s69,
"psoc64": psoc64,
diff --git a/memory_footprint.py b/memory_footprint.py
index 9aab726..9e12d71 100644
--- a/memory_footprint.py
+++ b/memory_footprint.py
@@ -99,43 +99,43 @@
cfg = get_configs_by_name([CI_CONFIG])[CI_CONFIG]
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.cmake_build_type == "Release" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "" and cfg.partition_ps == "ON"):
name_config = "CoreIPC"
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.cmake_build_type == "Release" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "" and cfg.partition_ps == "ON"):
name_config = "Default"
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.cmake_build_type == "Release" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "" and cfg.partition_ps == "ON"):
name_config = "CoreIPCTfmLevel2"
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.cmake_build_type == "Release" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_small" and cfg.partition_ps == "OFF"):
name_config = "DefaultProfileS"
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.cmake_build_type == "Minsizerel" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_small" and cfg.partition_ps == "OFF"):
name_config = "MinSizeProfileS"
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.cmake_build_type == "Release" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_medium" and cfg.partition_ps == "ON"):
name_config = "DefaultProfileM"
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.cmake_build_type == "Release" and
cfg.with_bl2 and cfg.with_ns and
cfg.profile == "profile_large" and cfg.partition_ps == "ON"):
name_config = "DefaultProfileL"
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 8f7f3ed..27152a7 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -164,7 +164,6 @@
"TEST_REGRESSION={}",
"TEST_PSA_API={}",
"CMAKE_BUILD_TYPE={}",
- "OTP={}",
"BL2={}",
"NS={}",
"PROFILE={}",
@@ -182,7 +181,6 @@
config_details.test_regression,
config_details.test_psa_api,
config_details.cmake_build_type,
- config_details.with_otp,
config_details.with_bl2,
config_details.with_ns,
"N.A" if not config_details.profile else config_details.profile,
@@ -451,7 +449,6 @@
"test_regression": i.test_regression,
"test_psa_api": i.test_psa_api,
"cmake_build_type": i.cmake_build_type,
- "with_otp": i.with_otp,
"with_bl2": i.with_bl2,
"with_ns": i.with_ns,
"profile": "" if i.profile=="N.A" else i.profile,
@@ -638,18 +635,16 @@
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] == "ENABLED": # OTP
- config_param.append("OTP")
- if list(i)[8]: # BL2
+ if list(i)[7]: # BL2
config_param.append("BL2")
- if list(i)[9]: # NS
+ if list(i)[8]: # NS
config_param.append("NS")
- if list(i)[10]: # PROFILE
- config_param.append(mapProfile[list(i)[10]])
- if list(i)[11] == "OFF": #PARTITION_PS
+ if list(i)[9]: # PROFILE
+ config_param.append(mapProfile[list(i)[9]])
+ if list(i)[10] == "OFF": #PARTITION_PS
config_param.append("PSOFF")
- if list(i)[12]: # EXTRA_PARAMS
- config_param.append(list(i)[12])
+ if list(i)[11]: # EXTRA_PARAMS
+ config_param.append(list(i)[11])
i_str = "_".join(config_param)
ret_cfg[i_str] = i
return ret_cfg