From patchwork Mon Nov 29 14:23:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51BAFC433F5 for ; Mon, 29 Nov 2021 14:23:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.61564.1638195815065647422 for ; Mon, 29 Nov 2021 06:23:35 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D898C1042 for ; Mon, 29 Nov 2021 06:23:33 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 83CA33F766 for ; Mon, 29 Nov 2021 06:23:33 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] arm/edk2-firmware: upgrade to edk2-firmware 202108 Date: Mon, 29 Nov 2021 14:23:27 +0000 Message-Id: <20211129142330.4018944-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 29 Nov 2021 14:23:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2472 Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/uefi/edk2-firmware_202105.bb | 4 ---- meta-arm/recipes-bsp/uefi/edk2-firmware_202108.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202105.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202108.bb diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202105.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202105.bb deleted file mode 100644 index e3c3d9f8..00000000 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202105.bb +++ /dev/null @@ -1,4 +0,0 @@ -SRCREV_edk2 ?= "e1999b264f1f9d7230edf2448f757c73da567832" -SRCREV_edk2-platforms ?= "86984c17d562fc60a6dabbc3a479d79163656a0c" - -require edk2-firmware.inc diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202108.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202108.bb new file mode 100644 index 00000000..58c0e4b7 --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202108.bb @@ -0,0 +1,4 @@ +SRCREV_edk2 ?= "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" +SRCREV_edk2-platforms ?= "64394fd2b48f403330feb8f7e954d1cca0822af5" + +require edk2-firmware.inc From patchwork Mon Nov 29 14:23:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 986 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63635C4332F for ; Mon, 29 Nov 2021 14:23:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.61382.1638195815053504772 for ; Mon, 29 Nov 2021 06:23:35 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 73E5D113E for ; Mon, 29 Nov 2021 06:23:34 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 16C363F766 for ; Mon, 29 Nov 2021 06:23:33 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] arm/sbsa-acs: upgrade to EDK2 202108 Date: Mon, 29 Nov 2021 14:23:28 +0000 Message-Id: <20211129142330.4018944-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129142330.4018944-1-ross.burton@arm.com> References: <20211129142330.4018944-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 29 Nov 2021 14:23:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2471 Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb index fa7f6d7a..11c4c51e 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb @@ -1,4 +1,4 @@ -require recipes-bsp/uefi/edk2-firmware_202105.bb +require recipes-bsp/uefi/edk2-firmware_202108.bb PROVIDES:remove = "virtual/uefi-firmware" From patchwork Mon Nov 29 14:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51BDEC433FE for ; Mon, 29 Nov 2021 14:23:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.61566.1638195815518942279 for ; Mon, 29 Nov 2021 06:23:35 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2F04F11D4 for ; Mon, 29 Nov 2021 06:23:35 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A8C213F766 for ; Mon, 29 Nov 2021 06:23:34 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] arm-bsp: use edk2-firmware instead of virtual/uefi-firmware Date: Mon, 29 Nov 2021 14:23:29 +0000 Message-Id: <20211129142330.4018944-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129142330.4018944-1-ross.burton@arm.com> References: <20211129142330.4018944-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 29 Nov 2021 14:23:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2473 Firmware isn't arbitarily interchangable as by definition it is specific to the platform, so use the real recipe name instead of a virtual name. Signed-off-by: Ross Burton --- meta-arm-bsp/conf/machine/n1sdp.conf | 2 +- meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb | 2 +- .../trusted-firmware-a/trusted-firmware-a-sgi575.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-arm-bsp/conf/machine/n1sdp.conf b/meta-arm-bsp/conf/machine/n1sdp.conf index 288d7608..643212fb 100644 --- a/meta-arm-bsp/conf/machine/n1sdp.conf +++ b/meta-arm-bsp/conf/machine/n1sdp.conf @@ -31,7 +31,7 @@ EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a" EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" #UEFI EDK2 firmware -EXTRA_IMAGEDEPENDS += "virtual/uefi-firmware" +EXTRA_IMAGEDEPENDS += "edk2-firmware" #grub-efi EFI_PROVIDER ?= "grub-efi" diff --git a/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb b/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb index 0ef68b9b..6f74159c 100644 --- a/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb +++ b/meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Firmware image recipe for generating SD-Card artifacts." inherit deploy nopackages -DEPENDS = "virtual/uefi-firmware \ +DEPENDS = "edk2-firmware \ virtual/control-processor-firmware \ n1sdp-board-firmware" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc index 84f679c1..5786ce0b 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-sgi575.inc @@ -9,7 +9,7 @@ TFA_MBEDTLS = "1" TFA_UBOOT = "0" # Sgi575 needs the UEFI as bl33 -DEPENDS += "virtual/uefi-firmware" +DEPENDS += "edk2-firmware" EXTRA_OEMAKE += "BL33=${RECIPE_SYSROOT}/firmware/uefi.bin" EXTRA_OEMAKE += "TRUSTED_BOARD_BOOT=1 GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \ From patchwork Mon Nov 29 14:23:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2524BC433EF for ; Mon, 29 Nov 2021 14:23:37 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.61700.1638195816412358393 for ; Mon, 29 Nov 2021 06:23:36 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F37201042 for ; Mon, 29 Nov 2021 06:23:35 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7C8DF3F766 for ; Mon, 29 Nov 2021 06:23:35 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/edk2-firmware: don't PROVIDE virtual/uefi-firmware Date: Mon, 29 Nov 2021 14:23:30 +0000 Message-Id: <20211129142330.4018944-4-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211129142330.4018944-1-ross.burton@arm.com> References: <20211129142330.4018944-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 29 Nov 2021 14:23:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2474 Interchangable firmware isn't really a workable concept, so there's no real need to have a virtual name. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 2 -- meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb | 2 -- 2 files changed, 4 deletions(-) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 2f6f42c0..66e0cc3e 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -4,8 +4,6 @@ HOMEPAGE = "https://github.com/tianocore/edk2" LICENSE = "BSD-2-Clause-Patent" -PROVIDES += "virtual/uefi-firmware" - # EDK2 LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" # EDK2 Platforms diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb index 11c4c51e..95995759 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb @@ -1,7 +1,5 @@ require recipes-bsp/uefi/edk2-firmware_202108.bb -PROVIDES:remove = "virtual/uefi-firmware" - LICENSE += "& Apache-2.0" LIC_FILES_CHKSUM += "file://ShellPkg/Application/sbsa-acs/LICENSE.md;md5=2a944942e1496af1886903d274dedb13"