commit e92be1b79e017bb4e314d349113c14470933303c
author rahulg-arm <rahul.g@arm.com> Thu Jan 02 16:19:31 2025 +0530
committer Rahul <rahul.g@arm.com> Fri Jan 03 11:12:00 2025 +0200
tree f4245e2c8fc83bb60c1628fd93bdfe28761d4a1b
parent b5b652b7f659de3cf8d4dc0ec3e3ed4460617db8

fix: update json file name for acs compilation

FFA ACS v1.2 release includes secure partition json files with version suffix in names. Fix renames json file for FFA v1.2.
- FFA v1.2 EL-0 SP: sp_layout_el0_v12.json
- FFA v1.1 EL-0 SP: sp_layout_el0_v11.json
- FFA v1.2 EL-1 SP: sp_layout_v12.json
- FFA v1.1 EL-1 SP: sp_layout_v11.json

Change-Id: Ieef1e9f9be6c68ea6b44a88d4fabad770305d7f0
Signed-off-by: rahulg-arm <rahul.g@arm.com>

acs/builder.sh

diff --git a/acs/builder.sh b/acs/builder.sh
index 3d0932c..e2c75a3 100755
--- a/acs/builder.sh
+++ b/acs/builder.sh
@@ -30,6 +30,7 @@
 		PLAT_TEST_SPM=1 \
 		ENABLE_FEAT_MTE2=1 \
 		SPD=spmd \
+		ENABLE_SPMD_LP=1\
 		ARM_BL2_SP_LIST_DTS=${WORKSPACE}/trusted-firmware-a/build/fvp/debug/sp_list_fragment.dts \
 		all fip -j8
 }
@@ -70,7 +71,7 @@
 
 echo "Building ACS test suite (S-EL1 targets)."
 build_acs 1
-build_tfa ${FFA_ACS_MANIFEST_FOLDER}/sp_layout.json ${FFA_ACS_MANIFEST_FOLDER}/fvp_spmc_manifest.dts
+build_tfa ${FFA_ACS_MANIFEST_FOLDER}/sp_layout_v12.json ${FFA_ACS_MANIFEST_FOLDER}/fvp_spmc_manifest.dts
 copy_tfa_fip ${WORKSPACE}/fip_sp_sel1.bin
 
 make -C ${WORKSPACE}/trusted-firmware-a realclean
@@ -82,7 +83,7 @@
 
 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
+build_tfa ${FFA_ACS_MANIFEST_FOLDER}/sp_layout_el0_v12.json ${FFA_ACS_MANIFEST_FOLDER}/fvp_spmc_manifest_el0.dts
 copy_tfa_fip ${WORKSPACE}/fip_sp_sel0.bin
 
 echo "Finished building all targets."