CS320: Enable Build and Regression tests for Corstone-320
Signed-off-by: Gergely Korcsák <gergely.korcsak@arm.com>
Change-Id: I4f0b6474e67329e658195d5c0509a21c9b26e078
diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 5e5aae5..a53e653 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -24,6 +24,7 @@
"arm/musca_s1" : "MUSCA_S1",
"arm/corstone1000" : "corstone1000",
"arm/mps4/corstone315" : "corstone315",
+ "arm/mps4/corstone320" : "corstone320",
"arm/mps3/corstone310/fvp" : "corstone310",
"arm/rse/tc/tc3" : "RSE_TC3",
"arm/rse/rdfremont" : "RSE_RDFremont",
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index d64a60e..1686de5 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -333,6 +333,9 @@
# corstone315_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2
("arm/mps4/corstone315", "ARMCLANG_6_21", "1",
"RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
+ # corstone320_ARMCLANG_1_RegBL2_RegS_RegNS_Debug_BL2
+ ("arm/mps4/corstone320", "ARMCLANG_6_21", "1",
+ "RegBL2, RegS, RegNS", "OFF", "Debug", True, "", ""),
# MUSCA_B1_GCC_1_RegBL2_RegS_RegNS_Minsizerel_BL2
("arm/musca_b1", "GCC_10_3", "1",
"RegBL2, RegS, RegNS", "OFF", "Minsizerel", True, "", ""),
@@ -911,6 +914,21 @@
"invalid": _common_tfm_invalid_configs + []
}
+config_corstone320 = {"seed_params": {
+ "tfm_platform": ["arm/mps4/corstone320"],
+ "compiler": ["GCC_10_3", "ARMCLANG_6_21"],
+ "isolation_level": ["1"],
+ "test_regression": ["OFF", "RegBL2, RegS, RegNS"],
+ "test_psa_api": ["OFF"],
+ "cmake_build_type": ["Debug", "Release"],
+ "with_bl2": [True],
+ "profile": [""],
+ "extra_params": [""]
+ },
+ "common_params": _common_tfm_builder_cfg,
+ "invalid": _common_tfm_invalid_configs + []
+ }
+
config_rse_tc3 = {"seed_params": {
"tfm_platform": ["arm/rse/tc/tc3"],
"compiler": ["GCC_10_3"],
@@ -1261,6 +1279,7 @@
"nightly_corstone310": config_corstone310,
"nightly_corstone310_pacbti" : config_corstone310_pacbti,
"nightly_corstone315": config_corstone315,
+ "nightly_corstone320": config_corstone320,
"nightly_corstone1000": config_corstone1000,
"nightly_rse_tc3": config_rse_tc3,
"nightly_rse_rdfremont": config_rse_rdfremont,
@@ -1288,6 +1307,7 @@
"release_cs300_fvp": config_cs300_fvp,
"release_corstone310": config_corstone310,
"release_corstone315": config_corstone315,
+ "release_corstone320": config_corstone320,
"release_rse_tc3": config_rse_tc3,
"release_rse_rdfremont": config_rse_rdfremont,
"release_rse_rd1ae": config_rse_rd1ae,
@@ -1321,6 +1341,7 @@
"musca_s1": config_musca_s1,
"corstone310": config_corstone310,
"corstone315": config_corstone315,
+ "corstone320": config_corstone320,
"rse_tc3": config_rse_tc3,
"rse_rdfremont": config_rse_rdfremont,
"rse_rd1ae": config_rse_rd1ae,
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index be359b0..79e48aa 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -203,6 +203,44 @@
}
}
+# FVP with BL1 and BL2 bootloader for Corstone320
+fvp_mps4_cs320_bl1_bl2 = {
+ "templ": "fvp_mps4.jinja2",
+ "job_name": "fvp_mps4_cs320_bl1_bl2",
+ "device_type": "fvp",
+ "job_timeout": 15,
+ "action_timeout": 10,
+ "monitor_timeout": 15,
+ "poweroff_timeout": 1,
+ "platforms": {"arm/mps4/corstone320": ""},
+ "binaries": {
+ "bl1": {
+ "data": "spe/bin/bl1_1.bin",
+ "offset": "0x11000000",
+ },
+ "bl2": {
+ "data": "spe/bin/bl2_signed.bin",
+ "offset": "0x12031400",
+ },
+ "cm_prov": {
+ "data": "spe/bin/cm_provisioning_bundle.bin",
+ "offset": "0x12024000",
+ },
+ "dm_prov": {
+ "data": "spe/bin/dm_provisioning_bundle.bin",
+ "offset": "0x1202aa00",
+ },
+ "tfm_s_ns_img": {
+ "data": "nspe/tfm_s_ns_signed.bin",
+ "offset": "0x38000000",
+ }
+ },
+ "monitors": {
+ 'no_reg_tests': no_reg_tests_monitors,
+ 'reg_tests': reg_tests_monitors,
+ }
+}
+
# FVP with BL1 and BL2 bootloader for Corstone1000
fvp_corstone1000 = {
"templ": "fvp_corstone1000.jinja2",
@@ -476,6 +514,7 @@
"fvp_mps2_an521_bl2": fvp_mps2_an521_bl2,
"fvp_mps2_an519_bl2": fvp_mps2_an519_bl2,
"fvp_mps4_cs315_bl1_bl2": fvp_mps4_cs315_bl1_bl2,
+ "fvp_mps4_cs320_bl1_bl2": fvp_mps4_cs320_bl1_bl2,
"fvp_corstone1000": fvp_corstone1000,
"fvp_rse_tc3": fvp_rse_tc3,
"qemu_mps2_bl2": qemu_mps2_bl2,