commit b38fefae86b81410420fe241a5a77655cd0a6a1e
author David Vincze <david.vincze@arm.com> Mon Oct 28 11:56:28 2024 +0000
committer David Vincze <david.vincze@arm.com> Wed Oct 30 15:45:01 2024 +0000
tree fcd5d10937ce3f69aaf1920bf85bae8b90b039d4
parent 9fc9e880dd5b6132b3b321c77d806b305dc80986

tc: Remove TC2 remains from run configs

The TC2 test configs using these fragments were removed in 547948a and
9fc9e88. TC3 tests are using the pre-built SCP BL2 image, TC4 is using
a unified binary (BL2 image is not distinguished).

Change-Id: Iefa9b1da61107d03e9b491364080300b67cf7e43
Signed-off-by: David Vincze <david.vincze@arm.com>

run_config/fvp-tc.spm.tftf

diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 803bbdb..92891d0 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -8,20 +8,10 @@
 source "$ci_root/run_config/tc_rse_utils.sh"
 
 post_tf_build() {
-    if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
-        if [ $plat_variant -eq 2 ]; then
-            # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
-            if [ ! -f "$archive/scp_ram.bin" ]; then
-                url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-            fi
-        elif [ $plat_variant -eq 3 ]; then
-            # Use pre-built SCP BL2 binary
-            url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-        fi
+    if [ $plat_variant -eq 3 ]; then
+        # Use pre-built SCP BL2 binary
+        url="$tfa_downloads/total_compute/tc$plat_variant/scp/$scp_revision/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
         archive_file "scp_ram.bin"
-    fi
-
-    if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
         build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin" SCP_BL2="$archive/scp_ram.bin"
     elif [ $plat_variant -eq 4 ]; then
         build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin"