commit 2acb902e85f4fa1dca0f7ed2571079dcf9b6ad40
author Leo Yan <leo.yan@arm.com> Fri Jul 26 17:29:32 2024 +0100
committer Leo Yan <leo.yan@arm.com> Wed Aug 28 14:41:08 2024 +0100
tree 18bf7037c517c792bcd06cfe0f5759b11295ff2a
parent 45d5163172757766b363ef95abc2633e6a4d2b13

tc: Fix up SCP binary path

On TC4, the SCP binary is unified to single image scp-css.bin, it does
not distinguish SCP BL1 and BL2 images. As a result, it is pointless to
test the SCP firmware with specifying SCP_BL2 option in fiptool.

This commit simply takes SCP binary as SCP ROM binary (scp-bl1.bin) to
fit into the CI framework. It skips to pass SCP_BL2 parameter for
building fip image on TC4.

Change-Id: Ia46bd8f855a16edc788106f7e0e5721582f0ca34
Signed-off-by: Leo Yan <leo.yan@arm.com>

run_config/fvp-fip.tc

diff --git a/run_config/fvp-fip.tc b/run_config/fvp-fip.tc
index e966093..88e67ac 100644
--- a/run_config/fvp-fip.tc
+++ b/run_config/fvp-fip.tc
@@ -11,13 +11,20 @@
 
 	# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
 	if [ ! -f "$archive/scp_ram.bin" ]; then
-		if [ $plat_variant -eq 2 ]; then
-			url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-		elif [ $plat_variant -eq 3 ]; then
-			url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+		if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
+			if [ $plat_variant -eq 2 ]; then
+				url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+			elif [ $plat_variant -eq 3 ]; then
+				url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+			fi
+
+			archive_file "scp_ram.bin"
 		fi
-		archive_file "scp_ram.bin"
 	fi
 
-	build_fip BL33="$archive/u-boot.bin" SCP_BL2="$archive/scp_ram.bin"
+	if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
+		build_fip BL33="$archive/u-boot.bin" SCP_BL2="$archive/scp_ram.bin"
+	elif [ $plat_variant -eq 4 ]; then
+		build_fip BL33="$archive/u-boot.bin"
+	fi
 }

run_config/fvp-tc.spm.tftf

diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 4a9e1db..4d524a2 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -9,15 +9,21 @@
 
 post_tf_build() {
     if [ ! -f "$archive/scp_ram.bin" ]; then
-        if [ $plat_variant -eq 2 ]; then
-            url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
-        elif [ $plat_variant -eq 3 ]; then
-            url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+        if [ $plat_variant -eq 2 ] || [ $plat_variant -eq 3 ]; then
+            if [ $plat_variant -eq 2 ]; then
+                url="$scp_mcp_downloads/totalcompute/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+            elif [ $plat_variant -eq 3 ]; then
+                url="$tfa_downloads/total_compute/tc$plat_variant/scp/tc$plat_variant-bl2.bin" saveas="scp_ram.bin" fetch_file
+            fi
+            archive_file "scp_ram.bin"
         fi
-        archive_file "scp_ram.bin"
     fi
 
-    build_fip BL33="$archive/tftf.bin" BL32="$archive/secure_hafnium.bin" SCP_BL2="$archive/scp_ram.bin"
+    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"
+    fi
 }
 
 fetch_tf_resource() {