feat(ci): build tfa and tftf in the job's workspace directory
This is useful when running locally - avoid polluting the source
directory with artefacts and allows more than 1 job to be built at the
same time.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I8e8e0ff4741d5454706fd96a55936d56c3a6d22e
diff --git a/tf_config/fvp-spm b/tf_config/fvp-spm
index 047fd17..1181dd0 100644
--- a/tf_config/fvp-spm
+++ b/tf_config/fvp-spm
@@ -8,7 +8,7 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
-ARM_BL2_SP_LIST_DTS=${tf_root}/build/fvp/${bin_mode}/sp_list_fragment.dts
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
+ARM_BL2_SP_LIST_DTS=${archive}/${mode}build/tfa/fvp/${bin_mode}/sp_list_fragment.dts
GIC_EXT_INTID=1
PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-hyp b/tf_config/fvp-spm-hyp
index fcc6b10..4f5191e 100644
--- a/tf_config/fvp-spm-hyp
+++ b/tf_config/fvp-spm-hyp
@@ -10,6 +10,6 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
GIC_EXT_INTID=1
PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-measured-boot b/tf_config/fvp-spm-measured-boot
index c357f34..d700526 100644
--- a/tf_config/fvp-spm-measured-boot
+++ b/tf_config/fvp-spm-measured-boot
@@ -8,7 +8,7 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
MEASURED_BOOT=1
USE_ROMLIB=1
FVP_TRUSTED_SRAM_SIZE=384
diff --git a/tf_config/fvp-spm-optee-sp b/tf_config/fvp-spm-optee-sp
index 4f1e7d8..786fc48 100644
--- a/tf_config/fvp-spm-optee-sp
+++ b/tf_config/fvp-spm-optee-sp
@@ -8,7 +8,7 @@
CTX_INCLUDE_EL2_REGS=1
PLAT=fvp
SPD=spmd
-SP_LAYOUT_FILE=${tf_root}/build/fvp/${bin_mode}/optee_sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tfa/fvp/${bin_mode}/optee_sp_layout.json
SPMD_SPM_AT_SEL2=1
GIC_EXT_INTID=1
PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-report-max-ctx-mem-use b/tf_config/fvp-spm-report-max-ctx-mem-use
index 315d4f8..136807b 100644
--- a/tf_config/fvp-spm-report-max-ctx-mem-use
+++ b/tf_config/fvp-spm-report-max-ctx-mem-use
@@ -15,4 +15,4 @@
PLATFORM_REPORT_CTX_MEM_USE=1
SPD=spmd
SPMD_SPM_AT_SEL2=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-rme b/tf_config/fvp-spm-rme
index f93d835..9137000 100644
--- a/tf_config/fvp-spm-rme
+++ b/tf_config/fvp-spm-rme
@@ -8,6 +8,6 @@
BRANCH_PROTECTION=1
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
GIC_EXT_INTID=1
PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-rst-bl31 b/tf_config/fvp-spm-rst-bl31
index a840c90..16fd679 100644
--- a/tf_config/fvp-spm-rst-bl31
+++ b/tf_config/fvp-spm-rst-bl31
@@ -12,6 +12,6 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
GIC_EXT_INTID=1
PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-spmd-lsp b/tf_config/fvp-spm-spmd-lsp
index 7b43eb5..b11838c 100644
--- a/tf_config/fvp-spm-spmd-lsp
+++ b/tf_config/fvp-spm-spmd-lsp
@@ -7,6 +7,6 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
GIC_EXT_INTID=1
PLAT_TEST_SPM=1
diff --git a/tf_config/fvp-spm-sve b/tf_config/fvp-spm-sve
index 6ad8ebc..91600f1 100644
--- a/tf_config/fvp-spm-sve
+++ b/tf_config/fvp-spm-sve
@@ -5,7 +5,7 @@
BRANCH_PROTECTION=1
ENABLE_FEAT_MTE2=1
ENABLE_SVE_FOR_SWD=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
SPD=spmd
SPMD_SPM_AT_SEL2=1
GIC_EXT_INTID=1
diff --git a/tf_config/fvp-spm-sve+sme b/tf_config/fvp-spm-sve+sme
index eebe2d3..f6e7939 100644
--- a/tf_config/fvp-spm-sve+sme
+++ b/tf_config/fvp-spm-sve+sme
@@ -9,4 +9,4 @@
PLAT=fvp
PLAT_TEST_SPM=1
SPD=spmd
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
diff --git a/tf_config/fvp-spm-tbb b/tf_config/fvp-spm-tbb
index 06ca8da..550904f 100644
--- a/tf_config/fvp-spm-tbb
+++ b/tf_config/fvp-spm-tbb
@@ -8,7 +8,7 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
ARM_ROTPK_LOCATION=devel_rsa
GENERATE_COT=1
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
diff --git a/tf_config/fvp-spm-tbb-dualroot b/tf_config/fvp-spm-tbb-dualroot
index 6c87551..a46656b 100644
--- a/tf_config/fvp-spm-tbb-dualroot
+++ b/tf_config/fvp-spm-tbb-dualroot
@@ -8,7 +8,7 @@
CTX_INCLUDE_PAUTH_REGS=1
ENABLE_FEAT_MTE2=1
BRANCH_PROTECTION=1
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
ARM_ROTPK_LOCATION=devel_rsa
GENERATE_COT=1
COT=dualroot
diff --git a/tf_config/fvp-tbb-mbedtls-mb-spm-rme b/tf_config/fvp-tbb-mbedtls-mb-spm-rme
index 27c72ba..38657a4 100644
--- a/tf_config/fvp-tbb-mbedtls-mb-spm-rme
+++ b/tf_config/fvp-tbb-mbedtls-mb-spm-rme
@@ -9,7 +9,7 @@
MEASURED_BOOT=1
PLAT=fvp
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
SPD=spmd
TRUSTED_BOARD_BOOT=1
GIC_EXT_INTID=1
diff --git a/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme b/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme
index ef285a5..9245f43 100644
--- a/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme
+++ b/tf_config/fvp-tbb-psa-mbedtls-mb-spm-rme
@@ -9,7 +9,7 @@
MEASURED_BOOT=1
PLAT=fvp
ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
-SP_LAYOUT_FILE=${tftf_root}/build/fvp/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/fvp/${bin_mode}/sp_layout.json
SPD=spmd
TRUSTED_BOARD_BOOT=1
GIC_EXT_INTID=1
diff --git a/tf_config/fvp-tc4-spm b/tf_config/fvp-tc4-spm
index 5a2da09..641e325 100644
--- a/tf_config/fvp-tc4-spm
+++ b/tf_config/fvp-tc4-spm
@@ -3,7 +3,7 @@
PLAT=tc
SCP_BL2=/dev/null
SPD=spmd
-SP_LAYOUT_FILE=${tftf_root}/build/tc/${bin_mode}/sp_layout.json
+SP_LAYOUT_FILE=${archive}/${mode}build/tftf/tc/${bin_mode}/sp_layout.json
TARGET_PLATFORM=4
CSS_LOAD_SCP_IMAGES=0
ENABLE_STACK_PROTECTOR=strong