From be19ce6b94a6643b99fda03f47c14f8ad8fc7756 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 14 Dec 2020 18:24:40 -0500 Subject: [PATCH] arm-bsp: have sgi575 use EDK2 sources Move sgi575 off its own unique version of EDK2 and onto using the version used in the EDK2 recipe. NOTE: SGI575 not compiling cleanly with EDK2 202011 Change-Id: I7ab9a6673cc91758121b618e6691c25ae67e9a21 Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/sgi575.conf | 2 ++ meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 7714d0d6..ef74d1f5 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -23,6 +23,8 @@ PREFERRED_VERSION_linux-yocto ?= "5.7%" KCONFIG_MODE = "--alldefconfig" SERIAL_CONSOLES = "115200;ttyAMA0" +PREFERRED_VERSION_edk2-firmware ?= "202008%" + #grub-efi EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc index 9666a1ee..708cd4c4 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc @@ -1,6 +1,3 @@ -SRCREV_edk2 = "50528537b2fb0ebdf32c719a0525635c93b905c2" -SRCREV_edk2-platforms = "b972f17b329a85e6aa4d69f240d459839ba8b47c" - # SGI575 specific EDK2 configurations EDK2_BUILD_RELEASE = "0" EDK2_PLATFORM = "Sgi575" @@ -9,5 +6,3 @@ EDK2_BIN_NAME = "BL33_AP_UEFI.fd" EDK2_ARCH = "AARCH64" COMPATIBLE_MACHINE = "sgi575" - -PV = "202005+git${SRCPV}"