From 9ed331bbd73c2448b7cd0c370e50fe23e5c027f4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 18 Dec 2020 17:40:32 +0000 Subject: [PATCH] arm-bsp/edk2-firmware: upgrade SGI575 to 202011 Change-Id: Id002f1f460d9a0d66c913d3f3c7bb460ae7d5904 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/sgi575.conf | 2 +- .../recipes-bsp/uefi/edk2-firmware_202008.bbappend | 7 ------- .../recipes-bsp/uefi/edk2-firmware_202011.bbappend | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 1b1001fd..860b6d76 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -21,7 +21,7 @@ PREFERRED_VERSION_linux-yocto ?= "5.7%" KCONFIG_MODE = "--alldefconfig" SERIAL_CONSOLES = "115200;ttyAMA0" -PREFERRED_VERSION_edk2-firmware ?= "202008%" +PREFERRED_VERSION_edk2-firmware ?= "202011%" #grub-efi EFI_PROVIDER ?= "grub-efi" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend deleted file mode 100644 index fb4abed7..00000000 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# Include machine specific configurations for UEFI EDK2 - -MACHINE_EDK2_REQUIRE ?= "" - -MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" - -require ${MACHINE_EDK2_REQUIRE} diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend index 8a656d7a..d34cd272 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend @@ -3,5 +3,6 @@ MACHINE_EDK2_REQUIRE ?= "" MACHINE_EDK2_REQUIRE_fvp-base = "edk2-firmware-fvp-base.inc" +MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" require ${MACHINE_EDK2_REQUIRE}