arm-bsp: update SCP for TC0

Update TC0 SCP from using a local version (non-standard) to use the
generic 2.7 recipe.

Change-Id: I68aca8fe7f1f7a574a2324dff348f80cd4989581
Signed-off-by: Jon Mason <jon.mason@arm.com>

meta-arm-bsp/conf/machine/tc0.conf

@@ -17,8 +17,6 @@ PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
 PREFERRED_VERSION_trusted-firmware-a ?= "2.3%"
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 
-PREFERRED_VERSION_scp-firmware ?= "2.6%"
-
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack"
 PREFERRED_VERSION_linux-arm64-ack ?= "5.4"
 

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc

@@ -1,12 +1,6 @@
 # TC0 specific SCP configuration
 
-# Intermediate SHA with 2.6 baseline version
-SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https"
-SRCREV = "6fad1d3e2f82b2ef51e55928ac3a678a75f64ef4"
-
 COMPATIBLE_MACHINE = "tc0"
 
 SCP_PLATFORM = "tc0"
 FW_TARGETS = "scp"
-
-PV = "2.6.0+git${SRCPV}"

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend

@@ -2,7 +2,6 @@
 
 MACHINE_SCP_REQUIRE ?= ""
 
-MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
 MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc"
 
 require ${MACHINE_SCP_REQUIRE}

meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend

@@ -4,5 +4,6 @@ MACHINE_SCP_REQUIRE ?= ""
 
 MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc"
 MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc"
+MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc"
 
 require ${MACHINE_SCP_REQUIRE}