diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 1f11acd8..441d8c61 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -31,7 +31,7 @@ PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" -PREFERRED_VERSION_scp-firmware ?= "2.6%" +PREFERRED_VERSION_scp-firmware ?= "2.7%" #UEFI EDK2 firmware EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware" diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc index efa3acb1..635ec399 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc @@ -1,6 +1,5 @@ # N1SDP specific SCP configurations and build instructions -SRCREV = "350be71a2ecef588b8ff5a095a0840de23506e45" SCP_PLATFORM = "n1sdp" SCP_LOG_LEVEL = "INFO" @@ -12,8 +11,6 @@ SRC_URI_append = " \ COMPATIBLE_MACHINE_n1sdp = "n1sdp" -PV = "2.6.0+git${SRCPV}" - DEPENDS += "fiptool-native" DEPENDS += "virtual/trusted-firmware-a" 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 b760ba75..06b236b0 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 @@ -2,7 +2,6 @@ MACHINE_SCP_REQUIRE ?= "" -MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc" MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc" MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc" 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 new file mode 100644 index 00000000..53bd022a --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend @@ -0,0 +1,7 @@ +# Include machine specific SCP configurations + +MACHINE_SCP_REQUIRE ?= "" + +MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" + +require ${MACHINE_SCP_REQUIRE}