acs: add S-EL0 partitions to the job
Add S-EL0 partitions setup build steps.
Before, however, build directory in acs
folder needs to be deleted.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: I950752e0b1b589c4fdc8973ee9cd5695720d1309
diff --git a/acs/builder.sh b/acs/builder.sh
index 682ceb2..3d0932c 100755
--- a/acs/builder.sh
+++ b/acs/builder.sh
@@ -62,13 +62,28 @@
make -C ${WORKSPACE}/hafnium PLATFORM=secure_aem_v8a_fvp_vhe
# Setup the ACS test suite.
-cd ${WORKSPACE}/ff-a-acs
+pushd ${WORKSPACE}/ff-a-acs
mkdir build
+popd
+
+FFA_ACS_MANIFEST_FOLDER=${WORKSPACE}/ff-a-acs/platform/manifest/tgt_tfa_fvp
echo "Building ACS test suite (S-EL1 targets)."
build_acs 1
-build_tfa ${WORKSPACE}/ff-a-acs/platform/manifest/tgt_tfa_fvp/sp_layout.json ${WORKSPACE}/ff-a-acs/platform/manifest/tgt_tfa_fvp/fvp_spmc_manifest.dts
+build_tfa ${FFA_ACS_MANIFEST_FOLDER}/sp_layout.json ${FFA_ACS_MANIFEST_FOLDER}/fvp_spmc_manifest.dts
copy_tfa_fip ${WORKSPACE}/fip_sp_sel1.bin
+make -C ${WORKSPACE}/trusted-firmware-a realclean
+
+# Clean ACS output folder.
+pushd ${WORKSPACE}/ff-a-acs
+rm -r build/*
+popd
+
+echo "Building ACS test suite (S-EL0 targets)."
+build_acs 0
+build_tfa ${FFA_ACS_MANIFEST_FOLDER}/sp_layout_el0.json ${FFA_ACS_MANIFEST_FOLDER}/fvp_spmc_manifest_el0.dts
+copy_tfa_fip ${WORKSPACE}/fip_sp_sel0.bin
+
echo "Finished building all targets."
cd ${WORKSPACE}
diff --git a/acs/runner.sh b/acs/runner.sh
index 4f0dfb2..a963dda 100755
--- a/acs/runner.sh
+++ b/acs/runner.sh
@@ -61,4 +61,4 @@
}
run_fvp ${WORKSPACE}/fip_sp_sel1.bin $SP_SEL1_LOGS
-#TODO: validate with the S-EL0 targets
+run_fvp ${WORKSPACE}/fip_sp_sel0.bin $SP_SEL0_LOGS