arm-bsp: update SCP for SGI575

Update SGI575 SCP from using a non-standard, post 2.6 release version of
SCP to using the generic v2.7 recipe.

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

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

@@ -14,8 +14,6 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.2%"
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
 
-PREFERRED_VERSION_scp-firmware ?= "2.6%"
-
 # Use kernel provided by linaro
 KERNEL_IMAGETYPE ?= "Image"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"

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

@@ -1,7 +1,5 @@
 # SGI575 specific SCP configurations and build instructions
 
-#it’s a tested tag post-2.6.0
-SRCREV    = "7a025658d8318e95dbab4259a8ff7834ae6d8061"
 SCP_PLATFORM  = "sgi575"
 SCP_LOG_LEVEL = "INFO"
 
@@ -13,7 +11,3 @@ do_install() {
     install -D "${B}/product/${SCP_PLATFORM}/scp_ramfw/release/bin/scp_ramfw.bin" "${D}/firmware/"
     install -D "${B}/product/${SCP_PLATFORM}/mcp_romfw/release/bin/mcp_romfw.bin" "${D}/firmware/"
 }
-
-
-PV = "2.6.0+git${SRCPV}"
-

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

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

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

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