Build: Enable BL2 regression tests with "test_regression"
BL2 regression tests can also be separately enabled by
"test_regression".
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ib107d50b468030edc75b76576b38f49dc9d9b1d4
diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index b1297fb..e8b12d6 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -38,7 +38,8 @@
# Map regression test parameters to short format
mapRegTest = {
- "OFF" : "-DTEST_S=OFF -DTEST_NS=OFF ",
+ "OFF" : "-DTEST_BL2=OFF -DTEST_S=OFF -DTEST_NS=OFF ",
+ "RegBL2" : "-DTEST_BL2=ON ",
"RegS" : "-DTEST_S=ON ",
"RegNS" : "-DTEST_NS=ON -DTEST_NS_FLIH_IRQ=OFF ",
}
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 34b6b6a..aeb4fde 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -163,8 +163,8 @@
# 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", "ARMCLANG_6_13", "*", "RegS, RegNS", "OFF", "Debug", "*", "", "*"),
- ("arm/musca_s1", "ARMCLANG_6_13", "*", "RegS, RegNS", "OFF", "Debug", "*", "", "*"),
+ ("arm/musca_b1", "ARMCLANG_6_13", "*", "RegBL2, RegS, RegNS", "OFF", "Debug", "*", "", "*"),
+ ("arm/musca_s1", "ARMCLANG_6_13", "*", "RegBL2, RegS, RegNS", "OFF", "Debug", "*", "", "*"),
# Load range overlap on Musca for IPC Debug type: T895
("arm/musca_b1", "ARMCLANG_6_13", "*", "*", "IPC", "Debug", "*", "*", "*"),
("arm/musca_s1", "ARMCLANG_6_13", "*", "*", "IPC", "Debug", "*", "*", "*"),
@@ -182,11 +182,11 @@
# Configure build manager to build several combinations
# Config group for per-patch job
config_pp_test = {"seed_params": {
- # AN519_ARMCLANG_IPC_1_RegS_RegNS_Debug_BL2
+ # AN519_ARMCLANG_IPC_1_RegBL2_RegS_RegNS_Debug_BL2
"tfm_platform": ["arm/mps2/an519"],
"compiler": ["ARMCLANG_6_13"],
"isolation_level": ["1"],
- "test_regression": ["RegS, RegNS"],
+ "test_regression": ["RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
"with_bl2": [True],
@@ -195,72 +195,72 @@
},
"common_params": _common_tfm_builder_cfg,
"valid": [
- # AN519_ARMCLANG_2_RegS_RegNS_Release_BL2
+ # AN519_ARMCLANG_2_RegBL2_RegS_RegNS_Release_BL2
("arm/mps2/an519", "ARMCLANG_6_13", "2",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # AN519_GCC_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN519_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an519", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # AN519_GCC_2_RegS_RegNS_Release_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN519_GCC_2_RegBL2_RegS_RegNS_Release_BL2
("arm/mps2/an519", "GCC_10_3", "2",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # AN519_GCC_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN519_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an519", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # AN521_ARMCLANG_1_RegS_RegNS_Debug_BL2_SMALL_PSOFF
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_SMALL_PSOFF
("arm/mps2/an521", "ARMCLANG_6_13", "1",
- "RegS, RegNS", "OFF", "Debug", True, "profile_small", "PSOFF"),
- # AN521_ARMCLANG_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_small", "PSOFF"),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an521", "ARMCLANG_6_13", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # AN521_ARMCLANG_2_RegS_RegNS_Release_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN521_ARMCLANG_2_RegBL2_RegS_RegNS_Release_BL2
("arm/mps2/an521", "ARMCLANG_6_13", "2",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # AN521_ARMCLANG_3_RegS_RegNS_Minsizerel_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN521_ARMCLANG_3_RegBL2_RegS_RegNS_Minsizerel_BL2
("arm/mps2/an521", "ARMCLANG_6_13", "3",
- "RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
- # AN521_ARMCLANG_1_RegS_RegNS_Debug_BL2_SMALL_PSOFF
+ "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_SMALL_PSOFF
("arm/mps2/an521", "ARMCLANG_6_13", "1",
- "RegS, RegNS", "OFF", "Debug", True, "profile_small", "PSOFF"),
- # AN521_GCC_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_small", "PSOFF"),
+ # AN521_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an521", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
# AN521_GCC_2_Debug_BL2_MEDIUM
("arm/mps2/an521", "GCC_10_3", "2",
- "RegS, RegNS", "OFF", "Debug", True, "profile_medium", ""),
- # AN521_GCC_2_RegS_RegNS_Release_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_medium", ""),
+ # AN521_GCC_2_RegBL2_RegS_RegNS_Release_BL2
("arm/mps2/an521", "GCC_10_3", "2",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # AN521_GCC_3_RegS_RegNS_Minsizerel_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN521_GCC_3_RegBL2_RegS_RegNS_Minsizerel_BL2
("arm/mps2/an521", "GCC_10_3", "3",
- "RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
- # AN521_GCC_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
+ # AN521_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an521", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # AN552_GNUARM_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN552_GNUARM_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps3/an552", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # AN552_GNUARM_1_RegS_RegNS_Release_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN552_GNUARM_1_RegBL2_RegS_RegNS_Release_BL2
("arm/mps3/an552", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # MUSCA_B1_GCC_1_RegS_RegNS_Minsizerel_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # MUSCA_B1_GCC_1_RegBL2_RegS_RegNS_Minsizerel_BL2
("arm/musca_b1", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
- # MUSCA_S1_ARMCLANG_2_RegS_RegNS_Release_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
+ # MUSCA_S1_ARMCLANG_2_RegBL2_RegS_RegNS_Release_BL2
("arm/musca_s1", "ARMCLANG_6_13", "2",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # MUSCA_S1_GCC_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # MUSCA_S1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/musca_s1", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # MUSCA_S1_GCC_2_RegS_RegNS_Release_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # MUSCA_S1_GCC_2_RegBL2_RegS_RegNS_Release_BL2
("arm/musca_s1", "GCC_10_3", "2",
- "RegS, RegNS", "OFF", "Release", True, "", ""),
- # MUSCA_S1_GCC_1_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # MUSCA_S1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/musca_s1", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Debug", True, "", ""),
- # MUSCA_S1_GCC_1_RegS_RegNS_Release_BL2_CC_DRIVER_PSA
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # MUSCA_S1_GCC_1_RegBL2_RegS_RegNS_Release_BL2_CC_DRIVER_PSA
("arm/musca_s1", "GCC_10_3", "1",
- "RegS, RegNS", "OFF", "Release", True, "", "CC_DRIVER_PSA"),
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", "CC_DRIVER_PSA"),
# RSS_TC_GCC_2_Release_BL2_PSOFF
("arm/rss/tc", "GCC_10_3", "2",
"RegS, RegNS", "OFF", "Release", True, "", "PSOFF"),
@@ -272,7 +272,7 @@
"OFF", "OFF", "Release", True, "", "CRYPTO_ON"),
# stm32l562e_dk_GCC_3_RegS_RegNS_Release_BL2_CRYPTO_OFF
("stm/stm32l562e_dk", "GCC_10_3", "3",
- "RegS, RegNS", "OFF", "Release", True, "", "CRYPTO_OFF"),
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", "CRYPTO_OFF"),
# psoc64_GCC_2_RegS_RegNS_Release
("cypress/psoc64", "GCC_10_3", "2",
"RegS, RegNS", "OFF", "Release", False, "", ""),
@@ -289,7 +289,7 @@
"arm/musca_b1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2", "3"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -309,7 +309,7 @@
"arm/musca_s1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2", "3"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -319,9 +319,9 @@
"common_params": _common_tfm_builder_cfg,
"valid": [
# sanity test for GCC v11.2
- # AN521_GCC_3_RegS_RegNS_Relwithdebinfo_BL2
+ # AN521_GCC_3_RegBL2_RegS_RegNS_Relwithdebinfo_BL2
("arm/mps2/an521", "GCC_11_2",
- "3", "RegS, RegNS", "OFF", "Relwithdebinfo",
+ "3", "RegBL2, RegS, RegNS", "OFF", "Relwithdebinfo",
True, "", ""),
],
"invalid": _common_tfm_invalid_configs + []
@@ -332,7 +332,7 @@
"tfm_platform": ["arm/mps2/an519", "arm/mps2/an521"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -352,7 +352,7 @@
"arm/musca_b1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -367,7 +367,7 @@
"tfm_platform": ["arm/musca_b1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -382,7 +382,7 @@
"tfm_platform": ["arm/mps2/an521"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["3"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -400,7 +400,7 @@
"arm/musca_b1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -416,7 +416,7 @@
"arm/musca_s1"],
"compiler": ["GCC_10_3"],
"isolation_level": ["1"],
- "test_regression": ["RegS, RegNS"],
+ "test_regression": ["RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
"with_bl2": [True],
@@ -432,7 +432,7 @@
"arm/mps3/an552"],
"compiler": ["GCC_10_3"],
"isolation_level": ["1", "2"],
- "test_regression": ["RegS, RegNS"],
+ "test_regression": ["RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True],
@@ -467,7 +467,7 @@
"tfm_platform": ["arm/mps2/an521"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2", "3"],
- "test_regression": ["RegS, RegNS"],
+ "test_regression": ["RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
"with_bl2": [True],
@@ -482,7 +482,7 @@
"tfm_platform": ["arm/mps2/an521"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1"],
- "test_regression": ["RegS, RegNS"],
+ "test_regression": ["RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release", "Minsizerel"],
"with_bl2": [True],
@@ -588,7 +588,7 @@
"tfm_platform": ["arm/mps2/an519"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True, False],
@@ -603,7 +603,7 @@
"tfm_platform": ["arm/mps2/an521"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2", "3"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True, False],
@@ -618,7 +618,7 @@
"tfm_platform": ["arm/mps3/an524"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True, False],
@@ -648,7 +648,7 @@
"tfm_platform": ["arm/mps3/an552"],
"compiler": ["GCC_10_3"],
"isolation_level": ["1", "2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True],
@@ -663,7 +663,7 @@
"tfm_platform": ["arm/musca_b1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2", "3"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True],
@@ -678,7 +678,7 @@
"tfm_platform": ["arm/musca_s1"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True],
@@ -708,7 +708,7 @@
"tfm_platform": ["arm/rss/tc"],
"compiler": ["GCC_10_3"],
"isolation_level": ["1", "2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug", "Release"],
"with_bl2": [True],
@@ -718,7 +718,7 @@
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
# BL2 is too large for RSS in Debug builds with tests
- ("arm/rss/tc", "GCC_10_3", "*", "RegS, RegNS", "*",
+ ("arm/rss/tc", "GCC_10_3", "*", "RegBL2, RegS, RegNS", "*",
"Debug", True, "*", "*"),
]
}
@@ -742,7 +742,7 @@
"tfm_platform": ["arm/corstone1000"],
"compiler": ["GCC_10_3"],
"isolation_level": ["1"],
- "test_regression": ["RegS"],
+ "test_regression": ["RegBL2, RegS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Debug"],
"with_bl2": [True],
@@ -757,7 +757,7 @@
"tfm_platform": ["stm/stm32l562e_dk"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2", "3"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
"with_bl2": [True],
@@ -766,11 +766,11 @@
},
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + [
- # Oversize issue on config stm32l562e_dk_ARMCLANG_1_RegS_RegNS_Release_BL2
+ # Oversize issue on config stm32l562e_dk_ARMCLANG_1_RegBL2_RegS_RegNS_Release_BL2
("stm/stm32l562e_dk", "ARMCLANG_6_13", "1",
- "RegS, RegNS", "OFF", "Release", True, "", "*"),
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", "*"),
# all other tests are off when CRYPTO is ON
- ("stm/stm32l562e_dk", "*", "*", "RegS, RegNS", "*",
+ ("stm/stm32l562e_dk", "*", "*", "RegBL2, RegS, RegNS", "*",
"*", "*", "*", "CRYPTO_ON"),
# all other tests are ON when CRYPTO is OFF
("stm/stm32l562e_dk", "*", "*", "OFF", "*",
@@ -782,7 +782,7 @@
"tfm_platform": ["stm/b_u585i_iot02a"],
"compiler": ["GCC_10_3", "ARMCLANG_6_13"],
"isolation_level": ["1", "2"],
- "test_regression": ["OFF", "RegS, RegNS"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
"cmake_build_type": ["Release"],
"with_bl2": [True],
@@ -915,7 +915,7 @@
}
config_debug_regr = deepcopy(config_debug)
-config_debug_regr["seed_params"]["test_regression"] = ["RegS, RegNS"]
+config_debug_regr["seed_params"]["test_regression"] = ["RegBL2, RegS, RegNS"]
config_debug_PSA_API = {"seed_params": {
"tfm_platform": ["arm/mps2/an521"],
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 006e378..c126e24 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -409,8 +409,6 @@
overwrite_params["test_psa_api"] += " -DCC312_LEGACY_DRIVER_API_ENABLED=OFF"
if i.tfm_platform == "arm/musca_b1":
overwrite_params["test_psa_api"] += " -DOTP_NV_COUNTERS_RAM_EMULATION=ON"
- if i.test_regression != "OFF":
- overwrite_params["extra_params"] += " -DTEST_BL2=False" if not i.with_bl2 else " -DTEST_BL2=True"
build_cfg["config_template"] %= overwrite_params
if len(build_cfg["build_cmds"]) > 1:
overwrite_build_dir = {"_tbm_build_dir_": build_dir}