CI: Fixes Musca B1 platform tests
Also removes post build on NSOFF Musca platforms as that is not necessary, as
they would not be able to run on the hardware anyway without NS.
Change-Id: I458a6a0e3e0a8750cee590a059dc96663330a12b
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index dce66ec..84c5555 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -89,7 +89,7 @@
"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;"
"%(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": ("if [ -f \"%(ci_build_root_dir)s/nspe\" ]; then "
+ "arm/musca_b1": ("if [ -d \"%(ci_build_root_dir)s/nspe\" ]; then "
"srec_cat "
"%(ci_build_root_dir)s/spe/bin/"
"bl2.bin "
@@ -101,20 +101,8 @@
"-fill 0xFF 0xA020000 0xA200000 "
"-o %(ci_build_root_dir)s/"
"spe/bin/tfm.hex -Intel;"
- "else "
- "srec_cat "
- "%(ci_build_root_dir)s/spe/bin/"
- "bl2.bin "
- "-Binary -offset 0xA000000 "
- "-fill 0xFF 0xA000000 0xA020000 "
- "%(ci_build_root_dir)s/spe/bin/"
- "tfm_s_signed.bin "
- "-Binary -offset 0xA020000 "
- "-fill 0xFF 0xA020000 0xA200000 "
- "-o %(ci_build_root_dir)s/"
- "spe/bin/tfm.hex -Intel;"
"fi;"),
- "arm/musca_s1": ("if [ -f \"%(ci_build_root_dir)s/nspe\" ]; then "
+ "arm/musca_s1": ("if [ -d \"%(ci_build_root_dir)s/nspe\" ]; then "
"srec_cat "
"%(ci_build_root_dir)s/spe/bin/"
"bl2.bin "
@@ -126,18 +114,6 @@
"-fill 0xFF 0xA020000 0xA200000 "
"-o %(ci_build_root_dir)s/"
"spe/bin/tfm.hex -Intel; "
- "else "
- "srec_cat "
- "%(ci_build_root_dir)s/spe/bin/"
- "bl2.bin "
- "-Binary -offset 0xA000000 "
- "-fill 0xFF 0xA000000 0xA020000 "
- "%(ci_build_root_dir)s/spe/bin/"
- "tfm_s_signed.bin "
- "-Binary -offset 0xA020000 "
- "-fill 0xFF 0xA020000 0xA200000 "
- "-o %(ci_build_root_dir)s/"
- "spe/bin/tfm.hex -Intel;"
"fi;"),
"arm/rse/tc": ("srec_cat "
"%(ci_build_root_dir)s/spe/bin/bl1_1.bin -Binary -offset 0x0 "