From 43203a464db17327bfad74fec947c932b20b91bf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Apr 2021 00:16:06 -0700 Subject: [PATCH] sbsa-acs: Fix build with clang 12 Signed-off-by: Khem Raj Signed-off-by: Jon Mason --- .../0001-pal_uefi-Fix-enum-conversion.patch | 31 +++++++++++++++++++ .../recipes-test/sbsa-acs/sbsa-acs_3.0.bb | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch diff --git a/meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch b/meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch new file mode 100644 index 00000000..f517ed65 --- /dev/null +++ b/meta-arm/recipes-test/sbsa-acs/sbsa-acs/0001-pal_uefi-Fix-enum-conversion.patch @@ -0,0 +1,31 @@ +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: Pending + +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-test/sbsa-acs/sbsa-acs_3.0.bb b/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb index c9da5857..e747fe49 100644 --- a/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-test/sbsa-acs/sbsa-acs_3.0.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM += "file://ShellPkg/Application/sbsa-acs/LICENSE.md;md5=2a94494 SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Application/sbsa-acs;protocol=https;branch=release;name=acs \ git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \ - file://shell.patch" + file://shell.patch \ + file://0001-pal_uefi-Fix-enum-conversion.patch" SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803" SRCREV_libc = "61687168fe02ac4d933a36c9145fdd242ac424d1"