feat: add TC4 FVP Docker image
This change adds support for the TC4 FVP Docker image to the
OpenCI. Also deprecates TC2.
Signed-off-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Icen Zeyada <Icen.Zeyada2@arm.com>
Change-Id: If71c1151a616283989188b2357ff52dfa6b50980
diff --git a/run_config/tc_rse_utils.sh b/run_config/tc_rse_utils.sh
index d15fc1f..f464725 100644
--- a/run_config/tc_rse_utils.sh
+++ b/run_config/tc_rse_utils.sh
@@ -16,11 +16,9 @@
host_binary_layout="`basename -s .bin ${1}`_ns"
# development PEM containing a key - use same key which is used for SCP BL1 in pre-built image
- if [ $plat_variant -eq 3 ]; then
- url="$tc_prebuilts/tc$plat_variant/root-EC-P256.pem" saveas="root-EC-P256.pem" fetch_file
- archive_file "root-EC-P256.pem"
- RSE_SIGN_PRIVATE_KEY=$archive/root-EC-P256.pem
- fi
+ url="$tc_prebuilts/tc$plat_variant/root-EC-P256.pem" saveas="root-EC-P256.pem" fetch_file
+ archive_file "root-EC-P256.pem"
+ RSE_SIGN_PRIVATE_KEY=$archive/root-EC-P256.pem
RSE_SEC_CNTR_INIT_VAL=1
RSE_LAYOUT_WRAPPER_VERSION="2.1.0"
@@ -78,28 +76,25 @@
archive_file "rse_bl2_signed.bin"
# Get pre-built rse TF-M S signed bin
- if [ $plat_variant -eq 3 ]; then
- url="$prebuild_prefix/rse_s_encrypted.bin" fetch_file
- archive_file "rse_s_encrypted.bin"
- url="$prebuild_prefix/rse_s_sic_tables_signed.bin" fetch_file
- archive_file "rse_s_sic_tables_signed.bin"
- fi
+ url="$prebuild_prefix/rse_s_encrypted.bin" fetch_file
+ archive_file "rse_s_encrypted.bin"
+ url="$prebuild_prefix/rse_s_sic_tables_signed.bin" fetch_file
+ archive_file "rse_s_sic_tables_signed.bin"
# Get pre-built SCP signed bin
url="$prebuild_prefix/signed_scp_romfw.bin" fetch_file
archive_file "signed_scp_romfw.bin"
# Create FIP layout
- if [ $plat_variant -eq 3 ]; then
- "$fiptool" update \
- --align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
- --align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
- --align 8192 --rse-ap-bl1 "$archive/$signed_bin" \
- --align 8192 --rse-s "$archive/rse_s_encrypted.bin" \
- --align 8192 --rse-sic-tables-s "$archive/rse_s_sic_tables_signed.bin" \
- --out "host_flash_fip.bin" \
- "$archive/fip.bin"
- fi
+ "$fiptool" update \
+ --align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
+ --align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
+ --align 8192 --rse-ap-bl1 "$archive/$signed_bin" \
+ --align 8192 --rse-s "$archive/rse_s_encrypted.bin" \
+ --align 8192 --rse-sic-tables-s "$archive/rse_s_sic_tables_signed.bin" \
+ --out "host_flash_fip.bin" \
+ "$archive/fip.bin"
+
archive_file "host_flash_fip.bin"
}