Hotfix: Update binary paths for MUSCA boards
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ie10546b60b38b3c79a6e2d7eab2666f29947b954
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 3da068a..448cadd 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -90,27 +90,27 @@
"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;"
"%(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 "
- "-Binary -offset 0xA000000 "
- "-fill 0xFF 0xA000000 0xA020000 "
- "%(ci_build_root_dir)s/nspe/"
- "tfm_s_ns_signed.bin "
- "-Binary -offset 0xA020000 "
- "-fill 0xFF 0xA020000 0xA200000 "
- "-o %(ci_build_root_dir)s/"
- "tfm.hex -Intel"),
+ "%(ci_build_root_dir)s/spe/bin/"
+ "bl2.bin "
+ "-Binary -offset 0xA000000 "
+ "-fill 0xFF 0xA000000 0xA020000 "
+ "%(ci_build_root_dir)s/nspe/"
+ "tfm_s_ns_signed.bin "
+ "-Binary -offset 0xA020000 "
+ "-fill 0xFF 0xA020000 0xA200000 "
+ "-o %(ci_build_root_dir)s/"
+ "%(ci_build_root_dir)s/spe/bin/tfm.hex -Intel"),
"arm/musca_s1": ("srec_cat "
- "%(ci_build_root_dir)s/spe/bin/"
- "bl2.bin "
- "-Binary -offset 0xA000000 "
- "-fill 0xFF 0xA000000 0xA020000 "
- "%(ci_build_root_dir)s/nspe/"
- "tfm_s_ns_signed.bin "
- "-Binary -offset 0xA020000 "
- "-fill 0xFF 0xA020000 0xA200000 "
- "-o %(ci_build_root_dir)s/"
- "tfm.hex -Intel"),
+ "%(ci_build_root_dir)s/spe/bin/"
+ "bl2.bin "
+ "-Binary -offset 0xA000000 "
+ "-fill 0xFF 0xA000000 0xA020000 "
+ "%(ci_build_root_dir)s/nspe/"
+ "tfm_s_ns_signed.bin "
+ "-Binary -offset 0xA020000 "
+ "-fill 0xFF 0xA020000 0xA200000 "
+ "-o %(ci_build_root_dir)s/"
+ "%(ci_build_root_dir)s/spe/bin/tfm.hex -Intel"),
"stm/stm32l562e_dk": ("echo 'STM32L562E-DK board post process';"
"%(ci_build_root_dir)s/spe/api_ns/postbuild.sh;"
"pushd %(ci_build_root_dir)s/spe/api_ns;"
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index 32c4cd2..2391b02 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -241,7 +241,7 @@
"poweroff_timeout": 40,
"platforms": {"arm/musca_b1": ""},
"binaries": {
- "firmware": "tfm.hex",
+ "firmware": "spe/bin/tfm.hex",
},
"monitors": {
'no_reg_tests': no_reg_tests_monitors,