From patchwork Mon Dec 13 14:27:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1109 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 E8B69C433EF for ; Mon, 13 Dec 2021 14:27:25 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.11550.1639405645151301892 for ; Mon, 13 Dec 2021 06:27:25 -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 AA5B5D6E for ; Mon, 13 Dec 2021 06:27:14 -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 545A33F73B for ; Mon, 13 Dec 2021 06:27:14 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] arm/sbsa-acs: reset PACKAGE_ARCH Date: Mon, 13 Dec 2021 14:27:11 +0000 Message-Id: <20211213142712.4080364-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, 13 Dec 2021 14:27:25 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2643 edk2-firmware is machine-specific, but this is a generic binary so we can reset PACKAGE_ARCH to the tune. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb | 3 ++- 1 file changed, 2 insertions(+), 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 d049834c..3e0f6ab4 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb @@ -13,8 +13,9 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803" SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1" -COMPATIBLE_MACHINE = "" COMPATIBLE_HOST = "aarch64.*-linux" +COMPATIBLE_MACHINE = "" +PACKAGE_ARCH = "${TUNE_PKGARCH}" EDK2_PLATFORM = "Shell" EDK2_PLATFORM_DSC = "ShellPkg/ShellPkg.dsc" From patchwork Mon Dec 13 14:27:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1108 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 E72DAC433EF for ; Mon, 13 Dec 2021 14:27:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.11752.1639405641767094960 for ; Mon, 13 Dec 2021 06:27:22 -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 3E901139F for ; Mon, 13 Dec 2021 06:27:15 -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 DCA7A3F73B for ; Mon, 13 Dec 2021 06:27:14 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] arm/sbsa-acs: upgrade to 3.1 Date: Mon, 13 Dec 2021 14:27:12 +0000 Message-Id: <20211213142712.4080364-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211213142712.4080364-1-ross.burton@arm.com> References: <20211213142712.4080364-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, 13 Dec 2021 14:27:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2642 Remove a backported patch which has been incorporated in this release. Signed-off-by: Ross Burton --- .../0001-pal_uefi-Fix-enum-conversion.patch | 30 ------------------- .../uefi/{sbsa-acs_3.0.bb => sbsa-acs_3.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 meta-arm/recipes-bsp/uefi/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch rename meta-arm/recipes-bsp/uefi/{sbsa-acs_3.0.bb => sbsa-acs_3.1.bb} (83%) diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch deleted file mode 100644 index 5a874e39..00000000 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d9101f353b16bf82fb0e8f1dac573aca97a6f3a7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Apr 2021 23:57:19 -0700 -Subject: [PATCH] pal_uefi: Fix enum conversion - -clang complains about enum type mismatches -al_uefi/src/pal_gic.c:224:20: error: implicit conversion from enumeration type 'INTR_TRIGGER_INFO_TYPE_e' to different enumeration type 'EFI_HARDWARE_INTERRUPT2_TRIGGER_TYPE' [-Werror,-Wenum-conversion] - -Upstream-Status: Backport [a68f6bc5933d912a938baf841304b8637ff923ce] -Signed-off-by: Khem Raj ---- - platform/pal_uefi/src/pal_gic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ShellPkg/Application/sbsa-acs/platform/pal_uefi/src/pal_gic.c b/ShellPkg/Application/sbsa-acs/platform/pal_uefi/src/pal_gic.c -index 7ce343d..b61aefc 100644 ---- a/ShellPkg/Application/sbsa-acs/platform/pal_uefi/src/pal_gic.c -+++ b/ShellPkg/Application/sbsa-acs/platform/pal_uefi/src/pal_gic.c -@@ -221,7 +221,7 @@ pal_gic_set_intr_trigger(UINT32 int_id, INTR_TRIGGER_INFO_TYPE_e trigger_type) - Status = gInterrupt2->SetTriggerType ( - gInterrupt2, - int_id, -- trigger_type -+ (EFI_HARDWARE_INTERRUPT2_TRIGGER_TYPE)trigger_type - ); - - if (EFI_ERROR(Status)) --- -2.31.1 - diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.1.bb similarity index 83% rename from meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb rename to meta-arm/recipes-bsp/uefi/sbsa-acs_3.1.bb index 3e0f6ab4..fabeeaef 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.1.bb @@ -3,14 +3,13 @@ require recipes-bsp/uefi/edk2-firmware_202111.bb LICENSE += "& Apache-2.0" LIC_FILES_CHKSUM += "file://ShellPkg/Application/sbsa-acs/LICENSE.md;md5=2a944942e1496af1886903d274dedb13" -SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Application/sbsa-acs;protocol=https;branch=release;name=acs \ +SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Application/sbsa-acs;protocol=https;branch=master;name=acs \ git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \ file://shell.patch \ - file://0001-pal_uefi-Fix-enum-conversion.patch \ file://use_bfd_linker.patch \ " -SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803" +SRCREV_acs = "ec02a7736ae5714326507c60595f4d5299e3dec8" SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1" COMPATIBLE_HOST = "aarch64.*-linux"