build_helper_configs: Revert the config_pp_test changes
Some configurations were disabled for split build.
Change-Id: I2e40b564acfb5a56e3aa61f0f22d005670419d62
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 2a00f0b..ebe61ae 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -196,12 +196,10 @@
# Configure build manager to build several combinations
# Config group for per-patch job
-
-# TODO: Revert the config change in pp test when merging back to master
config_pp_test = {"seed_params": {
- # AN521_ARMCLANG_IPC_1_RegBL2_RegS_RegNS_Debug_BL2
- "tfm_platform": ["arm/mps2/an521"],
- "compiler": ["GCC_10_3"],
+ # AN519_ARMCLANG_IPC_1_RegBL2_RegS_RegNS_Debug_BL2
+ "tfm_platform": ["arm/mps2/an519"],
+ "compiler": ["ARMCLANG_6_13"],
"isolation_level": ["1"],
"test_regression": ["RegBL2, RegS, RegNS"],
"test_psa_api": ["OFF"],
@@ -212,6 +210,36 @@
},
"common_params": _common_tfm_builder_cfg,
"valid": [
+ # AN519_ARMCLANG_2_RegBL2_RegS_RegNS_Release_BL2
+ ("arm/mps2/an519", "ARMCLANG_6_13", "2",
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN519_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
+ ("arm/mps2/an519", "GCC_10_3", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN519_GCC_2_RegBL2_RegS_RegNS_Release_BL2
+ ("arm/mps2/an519", "GCC_10_3", "2",
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN519_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
+ ("arm/mps2/an519", "GCC_10_3", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_SMALL_PSOFF
+ ("arm/mps2/an521", "ARMCLANG_6_13", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_small", "PSOFF"),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2
+ ("arm/mps2/an521", "ARMCLANG_6_13", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_IPC
+ ("arm/mps2/an521", "ARMCLANG_6_13", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", "IPC"),
+ # AN521_ARMCLANG_2_RegBL2_RegS_RegNS_Release_BL2
+ ("arm/mps2/an521", "ARMCLANG_6_13", "2",
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # AN521_ARMCLANG_3_RegBL2_RegS_RegNS_Minsizerel_BL2
+ ("arm/mps2/an521", "ARMCLANG_6_13", "3",
+ "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
+ # AN521_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2_SMALL_PSOFF
+ ("arm/mps2/an521", "ARMCLANG_6_13", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_small", "PSOFF"),
# AN521_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an521", "GCC_10_3", "1",
"RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
@@ -227,36 +255,51 @@
# AN521_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps2/an521", "GCC_10_3", "1",
"RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
- # MUSCA-B1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
- ("arm/musca_b1", "GCC_10_3", "1",
+ # CS300_FVP_GNUARM_2_RegBL2_RegS_RegNS_Debug_BL2
+ ("arm/mps3/corstone300/fvp", "GCC_10_3", "2",
"RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
- # MUSCA-B1_GCC_2_Debug_BL2_LARGET
- ("arm/musca_b1", "GCC_10_3", "2",
- "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_large", ""),
- # MUSCA-B1_GCC_2_RegBL2_RegS_RegNS_Release_BL2
- ("arm/musca_b1", "GCC_10_3", "2",
+ # CS300_FVP_GNUARM_2_RegBL2_RegS_RegNS_Release_BL2
+ ("arm/mps3/corstone300/fvp", "GCC_10_3", "2",
"RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
- # MUSCA-B1_GCC_3_RegBL2_RegS_RegNS_Minsizerel_BL2
- ("arm/musca_b1", "GCC_10_3", "3",
- "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
- # MUSCA-B1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
+ # MUSCA_B1_GCC_1_RegBL2_RegS_RegNS_Minsizerel_BL2
("arm/musca_b1", "GCC_10_3", "1",
- "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
- # MUSCA-S1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
+ "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
+ # MUSCA_S1_ARMCLANG_2_RegBL2_RegS_RegNS_Release_BL2
+ ("arm/musca_s1", "ARMCLANG_6_13", "2",
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
+ # MUSCA_S1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/musca_s1", "GCC_10_3", "1",
"RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
- # MUSCA-S1_GCC_1_Debug_BL2_SMALL
- ("arm/musca_s1", "GCC_10_3", "1",
- "RegBL2, RegS, RegNS", "OFF", "Debug", True, "profile_small", ""),
- # MUSCA-S1_GCC_2_RegBL2_RegS_RegNS_Release_BL2
+ # MUSCA_S1_GCC_2_RegBL2_RegS_RegNS_Release_BL2
("arm/musca_s1", "GCC_10_3", "2",
"RegBL2, RegS, RegNS", "OFF", "Release", True, "", ""),
- # MUSCA-S1_GCC_3_RegBL2_RegS_RegNS_Minsizerel_BL2
+ # MUSCA_S1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/musca_s1", "GCC_10_3", "1",
- "RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
- # MUSCA-S1_GCC_1_RegBL2_RegS_RegNS_Debug_BL2
+ "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",
- "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", "")
+ "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"),
+ # stm32l562e_dk_ARMCLANG_1_RegS_RegNS_Release_BL2_CRYPTO_OFF
+ ("stm/stm32l562e_dk", "ARMCLANG_6_13", "1",
+ "RegS, RegNS", "OFF", "Release", True, "", "CRYPTO_OFF"),
+ # stm32l562e_dk_GCC_2_Release_BL2_CRYPTO_ON
+ ("stm/stm32l562e_dk", "GCC_10_3", "2",
+ "OFF", "OFF", "Release", True, "", "CRYPTO_ON"),
+ # stm32l562e_dk_GCC_3_RegS_RegNS_Release_BL2_CRYPTO_OFF
+ ("stm/stm32l562e_dk", "GCC_10_3", "3",
+ "RegBL2, RegS, RegNS", "OFF", "Release", True, "", "CRYPTO_OFF"),
+ # b_u585i_iot02a_GCC_1_RegS_RegNS_Release_BL2
+ ("stm/b_u585i_iot02a", "GCC_10_3", "1",
+ "RegS, RegNS", "OFF", "Release", True, "", ""),
+ # b_u585i_iot02a_ARMCLANG_2_RegS_RegNS_Release_BL2
+ ("stm/b_u585i_iot02a", "ARMCLANG_6_13", "2",
+ "RegS, RegNS", "OFF", "Release", True, "", ""),
+ # psoc64_GCC_2_RegS_RegNS_Release
+ ("cypress/psoc64", "GCC_10_3", "2",
+ "RegS, RegNS", "OFF", "Release", False, "", ""),
],
"invalid": _common_tfm_invalid_configs + []
}