CS1K: Update build and test configs
This patch makes following changes on CS1K configs:
1. Build: Set "NSOFF" because only SPE is supported.
2. Build: Chang relative path of tool scripts to absolute path.
3. Test: Update path of binary files to be run.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I44d8535ab93481503875729a283bd3300171224c
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index feee704..4302edf 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -88,7 +88,7 @@
# Keys will append extra commands when matching target_platform
"post_build": {"arm/corstone1000": ("dd conv=notrunc bs=1 if=%(ci_build_root_dir)s/spe/bin/bl1_1.bin of=%(ci_build_root_dir)s/spe/bin/bl1.bin seek=0;"
"dd conv=notrunc bs=1 if=%(ci_build_root_dir)s/spe/bin/bl1_provisioning_bundle.bin of=%(ci_build_root_dir)s/spe/bin/bl1.bin seek=40960;"
- "../platform/ext/target/arm/corstone1000/create-flash-image.sh %(ci_build_root_dir)s/spe/bin/ cs1000.bin;"),
+ "%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/create-flash-image.sh %(ci_build_root_dir)s/spe/bin/ cs1000.bin;"),
"arm/musca_b1": ("srec_cat "
"%(ci_build_root_dir)s/spe/bin/"
"bl2.bin "
@@ -936,7 +936,7 @@
"cmake_build_type": ["Debug"],
"with_bl2": [True],
"profile": [""],
- "extra_params": ["CS1K_TEST, FVP", "CS1K_TEST, FPGA"]
+ "extra_params": ["NSOFF, CS1K_TEST, FVP", "NSOFF, CS1K_TEST, FPGA"]
},
"common_params": _common_tfm_builder_cfg,
"invalid": _common_tfm_invalid_configs + []
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 3e167ae..40bcac9 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -149,8 +149,8 @@
"platforms": {"arm/corstone1000": ""},
"data_bin_offset": "0x68000000",
"binaries": {
- "application": "bl1.bin",
- "data": "cs1000.bin"
+ "application": "spe/bin/bl1.bin",
+ "data": "spe/bin/cs1000.bin"
},
"monitors": {
'reg_tests': reg_tests_monitors if "FVP" in os.getenv('EXTRA_PARAMS') else [],