[PATCH 1/2] arm/sbsa-acs: reset PACKAGE_ARCH

[PATCH 1/2] arm/sbsa-acs: reset PACKAGE_ARCH

[Ross Burton]

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 <ross.burton@arm.com>
---
 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"
-- 
2.25.1

[PATCH 2/2] arm/sbsa-acs: upgrade to 3.1

[Ross Burton]

Remove a backported patch which has been incorporated in this release.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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"
-- 
2.25.1

Re: [PATCH 1/2] arm/sbsa-acs: reset PACKAGE_ARCH

[Jon Mason]

On Mon, 13 Dec 2021 14:27:11 +0000, Ross Burton wrote:
> edk2-firmware is machine-specific, but this is a generic binary so we
> can reset PACKAGE_ARCH to the tune.
> 
> 

Applied, thanks!

[1/2] arm/sbsa-acs: reset PACKAGE_ARCH
      commit: b180c39f152218d5b7da0f33403305e98a21d00b
[2/2] arm/sbsa-acs: upgrade to 3.1
      commit: 93d5313f60f9edb856b61f80370dd5797c5e5878

Best regards,
-- 
Jon Mason <jon.mason@arm.com>