diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index ef74d1f5..1b1001fd 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/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" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc index 158f481a..a2dab3b9 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc +++ b/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}" - diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend index 06b236b0..627689fe 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend +++ b/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} diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend index 53bd022a..9cbdcb6b 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend +++ b/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}