[PATCH] arm/edk2-firmware: upgrade to 202102

[PATCH] arm/edk2-firmware: upgrade to 202102

[Ross Burton]

The edk2 SRCREV is the tag, has edk2-platforms doesn't tag releases the
SRCREV is approximately the same date.

Also remove the PREFERRED_VERSION from SGI575 so it doesn't need to be
updated in the future.

Change-Id: I5ac544e70b404081bf0638a54514a412d87fb3d3
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm-bsp/conf/machine/sgi575.conf                         | 2 --
 ...firmware_202011.bbappend => edk2-firmware_202102.bbappend} | 0
 meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb             | 4 ----
 meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb             | 4 ++++
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename meta-arm-bsp/recipes-bsp/uefi/{edk2-firmware_202011.bbappend => edk2-firmware_202102.bbappend} (100%)
 delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb
 create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb

diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf
index f5baa0f..2004369 100644
--- a/meta-arm-bsp/conf/machine/sgi575.conf
+++ b/meta-arm-bsp/conf/machine/sgi575.conf
@@ -19,8 +19,6 @@ PREFERRED_VERSION_linux-yocto ?= "5.7%"
 KCONFIG_MODE = "--alldefconfig"
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
-PREFERRED_VERSION_edk2-firmware ?= "202011%"
-
 #grub-efi
 EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES += "efi"
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202102.bbappend
similarity index 100%
rename from meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend
rename to meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202102.bbappend
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb
deleted file mode 100644
index 94310e3..0000000
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-SRCREV_edk2           ?= "872f953262d68a11da7bc2fb3ded16df234b8700"
-SRCREV_edk2-platforms ?= "3f71a8fb114ae9ce87281eb30ab0e678f6806b05"
-
-require edk2-firmware.inc
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb
new file mode 100644
index 0000000..1352922
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb
@@ -0,0 +1,4 @@
+SRCREV_edk2           ?= "ef91b07388e1c0a50c604e5350eeda98428ccea6"
+SRCREV_edk2-platforms ?= "2620e05c6fade20ef5e1ba69280d09f9e2b3eff6"
+
+require edk2-firmware.inc
-- 
2.25.1

Re: [meta-arm] [PATCH] arm/edk2-firmware: upgrade to 202102

[Jon Mason]

On Tue, Mar 30, 2021 at 03:15:45PM +0100, Ross Burton wrote:
> The edk2 SRCREV is the tag, has edk2-platforms doesn't tag releases the
> SRCREV is approximately the same date.
> 
> Also remove the PREFERRED_VERSION from SGI575 so it doesn't need to be
> updated in the future.
> 
> Change-Id: I5ac544e70b404081bf0638a54514a412d87fb3d3
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---

Patch included into the master branch.

Thanks,
Jon

>  meta-arm-bsp/conf/machine/sgi575.conf                         | 2 --
>  ...firmware_202011.bbappend => edk2-firmware_202102.bbappend} | 0
>  meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb             | 4 ----
>  meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb             | 4 ++++
>  4 files changed, 4 insertions(+), 6 deletions(-)
>  rename meta-arm-bsp/recipes-bsp/uefi/{edk2-firmware_202011.bbappend => edk2-firmware_202102.bbappend} (100%)
>  delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb
>  create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb
> 
> diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf
> index f5baa0f..2004369 100644
> --- a/meta-arm-bsp/conf/machine/sgi575.conf
> +++ b/meta-arm-bsp/conf/machine/sgi575.conf
> @@ -19,8 +19,6 @@ PREFERRED_VERSION_linux-yocto ?= "5.7%"
>  KCONFIG_MODE = "--alldefconfig"
>  SERIAL_CONSOLES = "115200;ttyAMA0"
>  
> -PREFERRED_VERSION_edk2-firmware ?= "202011%"
> -
>  #grub-efi
>  EFI_PROVIDER ?= "grub-efi"
>  MACHINE_FEATURES += "efi"
> diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202102.bbappend
> similarity index 100%
> rename from meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend
> rename to meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202102.bbappend
> diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb
> deleted file mode 100644
> index 94310e3..0000000
> --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -SRCREV_edk2           ?= "872f953262d68a11da7bc2fb3ded16df234b8700"
> -SRCREV_edk2-platforms ?= "3f71a8fb114ae9ce87281eb30ab0e678f6806b05"
> -
> -require edk2-firmware.inc
> diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb
> new file mode 100644
> index 0000000..1352922
> --- /dev/null
> +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202102.bb
> @@ -0,0 +1,4 @@
> +SRCREV_edk2           ?= "ef91b07388e1c0a50c604e5350eeda98428ccea6"
> +SRCREV_edk2-platforms ?= "2620e05c6fade20ef5e1ba69280d09f9e2b3eff6"
> +
> +require edk2-firmware.inc
> -- 
> 2.25.1
> 

> 
> 
>