mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-07 03:04:27 +00:00
Code Issues Projects Releases Wiki Activity

arm/sbsa-acs: upgrade to 3.1

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

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2021-12-13 14:27:12 +00:00
committed by Jon Mason
parent b180c39f15
commit 93d5313f60
2 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-bsp/uefi/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch
-30
View File
@@ -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
meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb → meta-arm/recipes-bsp/uefi/sbsa-acs_3.1.bb
+2 -3
View File
@@ -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"