From patchwork Mon Dec 11 14:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 36031 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 16729C4167B for ; Mon, 11 Dec 2023 14:33:34 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9647.1702305206761721984 for ; Mon, 11 Dec 2023 06:33:26 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@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 ED6191007 for ; Mon, 11 Dec 2023 06:34:12 -0800 (PST) Received: from debian.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 45CDE3F738 for ; Mon, 11 Dec 2023 06:33:26 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH v2] arm/edk2: update to 202311 Date: Mon, 11 Dec 2023 08:33:16 -0600 Message-Id: <20231211143316.20581-1-jon.mason@arm.com> X-Mailer: git-send-email 2.30.2 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, 11 Dec 2023 14:33:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5302 Signed-off-by: Jon Mason --- ...ls-native_202308.bb => edk2-basetools-native_202311.bb} | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb | 7 ------- meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb | 7 +++++++ meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202308.bb => edk2-basetools-native_202311.bb} (93%) delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202308.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202311.bb similarity index 93% rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202308.bb rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202311.bb index 31b8fb08..6bd880bd 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202308.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202311.bb @@ -10,7 +10,7 @@ LICENSE = "BSD-2-Clause-Patent" SRC_URI = "git://github.com/tianocore/edk2.git;branch=master;protocol=https" LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" -SRCREV = "819cfc6b42a68790a23509e4fcc58ceb70e1965e" +SRCREV = "8736b8fdca85e02933cdb0a13309de14c9799ece" S = "${WORKDIR}/git" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb deleted file mode 100644 index 2619f2fd..00000000 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202308.bb +++ /dev/null @@ -1,7 +0,0 @@ -SRCREV_edk2 ?= "819cfc6b42a68790a23509e4fcc58ceb70e1965e" -SRCREV_edk2-platforms ?= "88ea1c2b62d44d6a4ebf2626ddaeecbc74f96877" - -# FIXME - clang is having issues with antlr -TOOLCHAIN:aarch64 = "gcc" - -require recipes-bsp/uefi/edk2-firmware.inc diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb new file mode 100644 index 00000000..aa11cfd1 --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202311.bb @@ -0,0 +1,7 @@ +SRCREV_edk2 ?= "8736b8fdca85e02933cdb0a13309de14c9799ece" +SRCREV_edk2-platforms ?= "d61836283a4c9198a02387fe7b31a8242e732f3f" + +# FIXME - clang is having issues with antlr +TOOLCHAIN:aarch64 = "gcc" + +require recipes-bsp/uefi/edk2-firmware.inc diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb index 781d6e05..a564e2ac 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.1.2.bb @@ -1,4 +1,4 @@ -require recipes-bsp/uefi/edk2-firmware_202308.bb +require recipes-bsp/uefi/edk2-firmware_202311.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0"