arm: new recipes for EDK2
PATCH 1/4 arm: new recipes for EDK2
Rework the EDK2 recipes to allow for multiple versions, and create a recipe for the latest version. This will allow for BSPs using the older version to continue to function while waiting to be upgraded. Also, rework the n1sdp recipe to use the 201911 recipe, but overwrite everything with its unique git trees.
---
meta-arm-bsp/conf/machine/n1sdp.conf | 1 +
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc | 9 +--------
.../recipes-bsp/uefi/edk2-firmware_201911.bbappend | 8 ++++++++
.../recipes-bsp/uefi/edk2-firmware_202008.bbappend | 7 +++++++
...rmware_git.bbappend => edk2-firmware_202011.bbappend} | 4 ----
.../recipes-bsp/uefi/files/{ => n1sdp}/initialise.patch | 0
.../uefi/{edk2-firmware_git.bb => edk2-firmware.inc} | 3 ---
meta-arm/recipes-bsp/uefi/edk2-firmware_201911.bb | 5 +++++
meta-arm/recipes-bsp/uefi/edk2-firmware_202008.bb | 4 ++++
meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb | 4 ++++
10 files changed, 30 insertions(+), 15 deletions(-)
create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_201911.bbappend
create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend
rename meta-arm-bsp/recipes-bsp/uefi/{edk2-firmware_git.bbappend => edk2-firmware_202011.bbappend} (52%)
rename meta-arm-bsp/recipes-bsp/uefi/files/{ => n1sdp}/initialise.patch (100%)
rename meta-arm/recipes-bsp/uefi/{edk2-firmware_git.bb => edk2-firmware.inc} (94%)
create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_201911.bb
create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202008.bb
create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bbmeta-arm-bsp/conf/machine/n1sdp.conf +1 -0
@@ -33,6 +33,7 @@ PREFERRED_VERSION_scp-firmware ?= "2.7%" #UEFI EDK2 firmware EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware" +PREFERRED_VERSION_edk2-firmware ?= "201911%" #grub-efi EFI_PROVIDER ?= "grub-efi"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc +1 -8
@@ -1,12 +1,7 @@ -EDK2_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2.git" -EDK2_PLATFORMS_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://initialise.patch" -# TAGS and commit ID as per N1SDP-2020.03.26 release -SRCREV_edk2 = "3ff8a6bffabad761279817252014d59b6069d68a" -SRCREV_edk2-platforms = "d9d32e6c8b7456d21ce365486ac563b6be36c20d" - # N1SDP specific EDK2 configurations EDK2_BUILD_RELEASE = "0" EDK2_PLATFORM = "n1sdp"
@@ -16,8 +11,6 @@ EDK2_ARCH = "AARCH64" COMPATIBLE_MACHINE = "n1sdp" -PV = "201908+git${SRCPV}" - # UEFI EDK2 on N1SDP is unable to detect FS2 during boot resulting in launching of # EDK2 shell instead of launching grub. The startup.nsh will force launching of grub EFIDIR = "/EFI/BOOT"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_201911.bbappend new file +8 -0
@@ -0,0 +1,8 @@ +EDK2_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2.git" +EDK2_PLATFORMS_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git" + +# TAGS and commit ID as per N1SDP-2020.03.26 release +SRCREV_edk2 = "3ff8a6bffabad761279817252014d59b6069d68a" +SRCREV_edk2-platforms = "d9d32e6c8b7456d21ce365486ac563b6be36c20d" + +require edk2-firmware-n1sdp.inc
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend new file +7 -0
@@ -0,0 +1,7 @@ +# Include machine specific configurations for UEFI EDK2 + +MACHINE_EDK2_REQUIRE ?= "" + +MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" + +require ${MACHINE_EDK2_REQUIRE}
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend renamed from meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend +0 -4
@@ -1,11 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - # Include machine specific configurations for UEFI EDK2 MACHINE_EDK2_REQUIRE ?= "" -MACHINE_EDK2_REQUIRE_n1sdp = "edk2-firmware-n1sdp.inc" -MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" MACHINE_EDK2_REQUIRE_fvp-base = "edk2-firmware-fvp-base.inc" require ${MACHINE_EDK2_REQUIRE}
meta-arm-bsp/recipes-bsp/uefi/files/n1sdp/initialise.patch renamed from meta-arm-bsp/recipes-bsp/uefi/files/initialise.patch +0 -0
meta-arm/recipes-bsp/uefi/edk2-firmware.inc renamed from meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb +0 -3
@@ -20,9 +20,6 @@ SRC_URI = "\ ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms;nobranch=1 \ " -PV = "202008+git${SRCPV}" -SRCREV_edk2 ?= "06dc822d045c2bb42e497487935485302486e151" -SRCREV_edk2-platforms ?= "7aab81a35aef7b295e73d7d6dfd528cc812790ed" SRCREV_FORMAT = "edk2_edk2-platforms" EDK2_BUILD_RELEASE ?= "1"
meta-arm/recipes-bsp/uefi/edk2-firmware_201911.bb new file +5 -0
@@ -0,0 +1,5 @@ +SRCREV_edk2 ?= "bd85bf54c268204c7a698a96f3ccd96cd77952cd" +SRCREV_edk2-platforms ?= "46df7b29afeb846ee664e48949f9c8161abf1f2f" + +require edk2-firmware.inc +
meta-arm/recipes-bsp/uefi/edk2-firmware_202008.bb new file +4 -0
@@ -0,0 +1,4 @@ +SRCREV_edk2 ?= "06dc822d045c2bb42e497487935485302486e151" +SRCREV_edk2-platforms ?= "7aab81a35aef7b295e73d7d6dfd528cc812790ed" + +require edk2-firmware.inc
meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb new file +4 -0
@@ -0,0 +1,4 @@ +SRCREV_edk2 ?= "872f953262d68a11da7bc2fb3ded16df234b8700" +SRCREV_edk2-platforms ?= "46df7b29afeb846ee664e48949f9c8161abf1f2f" + +require edk2-firmware.inc
Signature · 1 line
2.17.1
PATCH 2/4 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
--- 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(-)
meta-arm-bsp/conf/machine/sgi575.conf +2 -0
@@ -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"
meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-sgi575.inc +0 -5
@@ -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}"
Signature · 1 line
2.17.1
PATCH 3/4 arm-bsp: update SCP for SGI575
In reply to Jon MasonUpdate SGI575 SCP from using a non-standard, post 2.6 release version of SCP to using the generic v2.7 recipe.
--- meta-arm-bsp/conf/machine/sgi575.conf | 2 -- .../recipes-bsp/scp-firmware/scp-firmware-sgi575.inc | 6 ------ .../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend | 1 - .../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend | 1 + 4 files changed, 1 insertion(+), 9 deletions(-)
meta-arm-bsp/conf/machine/sgi575.conf +0 -2
@@ -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"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc +0 -6
@@ -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}" -
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend +0 -1
@@ -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}
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend +1 -0
@@ -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}
Signature · 1 line
2.17.1
PATCH 4/4 arm-bsp: update SCP for TC0
In reply to Jon MasonUpdate TC0 SCP from using a local version (non-standard) to use the generic 2.7 recipe.
--- meta-arm-bsp/conf/machine/tc0.conf | 2 -- meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc | 6 ------ .../recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend | 1 - .../recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend | 1 + 4 files changed, 1 insertion(+), 9 deletions(-)
meta-arm-bsp/conf/machine/tc0.conf +0 -2
@@ -17,8 +17,6 @@ PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a" PREFERRED_VERSION_trusted-firmware-a ?= "2.3%" EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" -PREFERRED_VERSION_scp-firmware ?= "2.6%" - PREFERRED_PROVIDER_virtual/kernel ?= "linux-arm64-ack" PREFERRED_VERSION_linux-arm64-ack ?= "5.4"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc0.inc +0 -6
@@ -1,12 +1,6 @@ # TC0 specific SCP configuration -# Intermediate SHA with 2.6 baseline version -SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https" -SRCREV = "6fad1d3e2f82b2ef51e55928ac3a678a75f64ef4" - COMPATIBLE_MACHINE = "tc0" SCP_PLATFORM = "tc0" FW_TARGETS = "scp" - -PV = "2.6.0+git${SRCPV}"
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend +0 -1
@@ -2,7 +2,6 @@ MACHINE_SCP_REQUIRE ?= "" -MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc" MACHINE_SCP_REQUIRE_juno = "scp-firmware-juno.inc" require ${MACHINE_SCP_REQUIRE}
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.7%.bbappend +1 -0
@@ -4,5 +4,6 @@ MACHINE_SCP_REQUIRE ?= "" MACHINE_SCP_REQUIRE_n1sdp = "scp-firmware-n1sdp.inc" MACHINE_SCP_REQUIRE_sgi575 = "scp-firmware-sgi575.inc" +MACHINE_SCP_REQUIRE_tc0 = "scp-firmware-tc0.inc" require ${MACHINE_SCP_REQUIRE}
Signature · 1 line
2.17.1
Quoted 8 lines · Jon Mason
Rework the EDK2 recipes to allow for multiple versions, and create a recipe for the latest version. This will allow for BSPs using the older version to continue to function while waiting to be upgraded. Also, rework the n1sdp recipe to use the 201911 recipe, but overwrite everything with its unique git trees.
Change-Id I96869191bcf896ea17304d2ccf93da58605c72a1Signed-off-by Jon Mason <[email protected]>
Series applied to master.
Thanks,
Jon
Quoted 165 lines
--- meta-arm-bsp/conf/machine/n1sdp.conf | 1 + meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc | 9 +-------- .../recipes-bsp/uefi/edk2-firmware_201911.bbappend | 8 ++++++++ .../recipes-bsp/uefi/edk2-firmware_202008.bbappend | 7 +++++++ ...rmware_git.bbappend => edk2-firmware_202011.bbappend} | 4 ---- .../recipes-bsp/uefi/files/{ => n1sdp}/initialise.patch | 0 .../uefi/{edk2-firmware_git.bb => edk2-firmware.inc} | 3 --- meta-arm/recipes-bsp/uefi/edk2-firmware_201911.bb | 5 +++++ meta-arm/recipes-bsp/uefi/edk2-firmware_202008.bb | 4 ++++ meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb | 4 ++++ 10 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_201911.bbappend create mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend rename meta-arm-bsp/recipes-bsp/uefi/{edk2-firmware_git.bbappend => edk2-firmware_202011.bbappend} (52%) rename meta-arm-bsp/recipes-bsp/uefi/files/{ => n1sdp}/initialise.patch (100%) rename meta-arm/recipes-bsp/uefi/{edk2-firmware_git.bb => edk2-firmware.inc} (94%) create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_201911.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202008.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202011.bbmeta-arm-bsp/conf/machine/n1sdp.conf +1
-0@@ -33,6 +33,7 @@ PREFERRED_VERSION_scp-firmware ?= "2.7%" #UEFI EDK2 firmware EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware" +PREFERRED_VERSION_edk2-firmware ?= "201911%" #grub-efi EFI_PROVIDER ?= "grub-efi"meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-n1sdp.inc +1
-8@@ -1,12 +1,7 @@ -EDK2_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2.git" -EDK2_PLATFORMS_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://initialise.patch" -# TAGS and commit ID as per N1SDP-2020.03.26 release -SRCREV_edk2 = "3ff8a6bffabad761279817252014d59b6069d68a" -SRCREV_edk2-platforms = "d9d32e6c8b7456d21ce365486ac563b6be36c20d" - # N1SDP specific EDK2 configurations EDK2_BUILD_RELEASE = "0" EDK2_PLATFORM = "n1sdp"@@ -16,8 +11,6 @@ EDK2_ARCH = "AARCH64" COMPATIBLE_MACHINE = "n1sdp" -PV = "201908+git${SRCPV}" - # UEFI EDK2 on N1SDP is unable to detect FS2 during boot resulting in launching of # EDK2 shell instead of launching grub. The startup.nsh will force launching of grub EFIDIR = "/EFI/BOOT"meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_201911.bbappend new file +8
-0@@ -0,0 +1,8 @@ +EDK2_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2.git" +EDK2_PLATFORMS_SRC_URI = "git://git.linaro.org/landing-teams/working/arm/edk2-platforms.git" + +# TAGS and commit ID as per N1SDP-2020.03.26 release +SRCREV_edk2 = "3ff8a6bffabad761279817252014d59b6069d68a" +SRCREV_edk2-platforms = "d9d32e6c8b7456d21ce365486ac563b6be36c20d" + +require edk2-firmware-n1sdp.incmeta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202008.bbappend new file +7
-0@@ -0,0 +1,7 @@ +# Include machine specific configurations for UEFI EDK2 + +MACHINE_EDK2_REQUIRE ?= "" + +MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" + +require ${MACHINE_EDK2_REQUIRE}meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202011.bbappend renamed from meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_git.bbappend +0
-4@@ -1,11 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - # Include machine specific configurations for UEFI EDK2 MACHINE_EDK2_REQUIRE ?= "" -MACHINE_EDK2_REQUIRE_n1sdp = "edk2-firmware-n1sdp.inc" -MACHINE_EDK2_REQUIRE_sgi575 = "edk2-firmware-sgi575.inc" MACHINE_EDK2_REQUIRE_fvp-base = "edk2-firmware-fvp-base.inc" require ${MACHINE_EDK2_REQUIRE}meta-arm-bsp/recipes-bsp/uefi/files/n1sdp/initialise.patch renamed from meta-arm-bsp/recipes-bsp/uefi/files/initialise.patch +0
-0meta-arm/recipes-bsp/uefi/edk2-firmware.inc renamed from meta-arm/recipes-bsp/uefi/edk2-firmware_git.bb +0
-3@@ -20,9 +20,6 @@ SRC_URI = "\ ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms;nobranch=1 \ " -PV = "202008+git${SRCPV}" -SRCREV_edk2 ?= "06dc822d045c2bb42e497487935485302486e151" -SRCREV_edk2-platforms ?= "7aab81a35aef7b295e73d7d6dfd528cc812790ed" SRCREV_FORMAT = "edk2_edk2-platforms" EDK2_BUILD_RELEASE ?= "1"meta-arm/recipes-bsp/uefi/edk2-firmware_201911.bb new file +5
-0@@ -0,0 +1,5 @@ +SRCREV_edk2 ?= "bd85bf54c268204c7a698a96f3ccd96cd77952cd" +SRCREV_edk2-platforms ?= "46df7b29afeb846ee664e48949f9c8161abf1f2f" + +require edk2-firmware.inc +meta-arm/recipes-bsp/uefi/edk2-firmware_202008.bb new file +4
-0@@ -0,0 +1,4 @@ +SRCREV_edk2 ?= "06dc822d045c2bb42e497487935485302486e151" +SRCREV_edk2-platforms ?= "7aab81a35aef7b295e73d7d6dfd528cc812790ed" + +require edk2-firmware.incmeta-arm/recipes-bsp/uefi/edk2-firmware_202011.bb new file +4
-0@@ -0,0 +1,4 @@ +SRCREV_edk2 ?= "872f953262d68a11da7bc2fb3ded16df234b8700" +SRCREV_edk2-platforms ?= "46df7b29afeb846ee664e48949f9c8161abf1f2f" + +require edk2-firmware.incSignature · 1 line
2.17.1