mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-01-12 03:10:15 +00:00
arm/edk2-firmware: upgrade to 2022.05
Add a patch to fix uninitialized varibles, detected by Clang when building for Juno. However, whilst it now compiles it can't generate firmware images correctly, so it has to remain forcing GCC. Remove the workaround to force debug builds when using Clang, as this is now fixed. Drop upstreamed patches from sbsa-acs. Signed-off-by: Ross Burton <ross.burton@arm.com>
This commit is contained in:
Ross Burton
Jon Mason
@@ -4,7 +4,6 @@ EDK2_BIN_NAME = "BL33_AP_UEFI.fd"
|
||||
|
||||
COMPATIBLE_MACHINE = "juno"
|
||||
|
||||
# As of 2022-01-10 the Juno build fails with Clang:
|
||||
# edk2-firmware/202111-r0/edk2/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c:216:11:
|
||||
# error: variable 'FileSize' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
|
||||
# As of 2022-06-14 with 2022.05, clang builds fail:
|
||||
# "The required fv image size 0x104048 exceeds the set fv image size 0xf9000"
|
||||
TOOLCHAIN = "gcc"
|
||||
|
||||
@@ -18,6 +18,7 @@ SRC_URI = "\
|
||||
${EDK2_SRC_URI};name=edk2;destsuffix=edk2;nobranch=1 \
|
||||
${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms;nobranch=1 \
|
||||
file://unaligned.patch \
|
||||
file://default.patch \
|
||||
"
|
||||
|
||||
SRCREV_FORMAT = "edk2_edk2-platforms"
|
||||
@@ -27,10 +28,6 @@ COMPATIBLE_MACHINE ?= "invalid"
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
EDK2_BUILD_RELEASE = "1"
|
||||
# Release builds don't work with clang yet:
|
||||
# https://bugzilla.tianocore.org/show_bug.cgi?id=3758.
|
||||
# Can be removed in 202202 (c9b7c6e)
|
||||
EDK2_BUILD_RELEASE:toolchain-clang = "0"
|
||||
|
||||
EDK2_PLATFORM = "unset"
|
||||
# build --platform
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
SRCREV_edk2 ?= "b24306f15daa2ff8510b06702114724b33895d3c"
|
||||
SRCREV_edk2-platforms ?= "c9e377b00fc086fcb5a5b41663a0149bde9bcc2e"
|
||||
|
||||
require edk2-firmware.inc
|
||||
4
meta-arm/recipes-bsp/uefi/edk2-firmware_202205.bb
Normal file
4
meta-arm/recipes-bsp/uefi/edk2-firmware_202205.bb
Normal file
@@ -0,0 +1,4 @@
|
||||
SRCREV_edk2 ?= "16779ede2d366bfc6b702e817356ccf43425bcc8"
|
||||
SRCREV_edk2-platforms ?= "3b896d1a325686de3942723c42f286090453e37a"
|
||||
|
||||
require edk2-firmware.inc
|
||||
23
meta-arm/recipes-bsp/uefi/files/default.patch
Normal file
23
meta-arm/recipes-bsp/uefi/files/default.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
Platform/ARM: fix uninitialized variable FileSize in RunAxf
|
||||
|
||||
Clang 14 detects a potentially uninitialized variable FileSize:
|
||||
|
||||
RunAxf.c:216:11: error: variable 'FileSize' is used uninitialized
|
||||
whenever 'if' condition is false
|
||||
RunAxf.c:281:38: note: uninitialized use occurs here
|
||||
WriteBackDataCacheRange (FileData, FileSize);
|
||||
^~~~~~~~
|
||||
|
||||
Reading the code it doesn't look like this can actually happen, but we
|
||||
can keep clang happy by initialising FileSize to 0.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
diff --git a/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c b/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
|
||||
index d23739ad38..fba5e0ba30 100644
|
||||
--- a/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
|
||||
+++ b/edk2-platforms/Platform/ARM/Library/ArmShellCmdRunAxf/RunAxf.c
|
||||
@@ -136,1 +136,1 @@ ShellDynCmdRunAxfHandler (
|
||||
- UINTN FileSize;
|
||||
+ UINTN FileSize = 0;
|
||||
@@ -1,51 +0,0 @@
|
||||
From 85021f8cf22d1bd4114803c6c610dea5ef0059f1 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 24 Mar 2022 20:04:35 +0800
|
||||
Subject: [PATCH] BaseTools: fix gcc12 warning
|
||||
|
||||
Sdk/C/LzmaEnc.c: In function ?LzmaEnc_CodeOneMemBlock?:
|
||||
Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*p.rc.outStream? [-Werror=dangling-pointer=]
|
||||
2828 | p->rc.outStream = &outStream.vt;
|
||||
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
|
||||
Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
|
||||
2811 | CLzmaEnc_SeqOutStreamBuf outStream;
|
||||
| ^~~~~~~~~
|
||||
Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
|
||||
Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*(CLzmaEnc *)pp.rc.outStream? [-Werror=dangling-pointer=]
|
||||
2828 | p->rc.outStream = &outStream.vt;
|
||||
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
|
||||
Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
|
||||
2811 | CLzmaEnc_SeqOutStreamBuf outStream;
|
||||
| ^~~~~~~~~
|
||||
Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/85021f8cf22d1bd4114803c6c610dea5ef0059f1]
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
|
||||
---
|
||||
BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
|
||||
index 4e9b499f8d..4b9f5fa692 100644
|
||||
--- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
|
||||
+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
|
||||
@@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
|
||||
|
||||
nowPos64 = p->nowPos64;
|
||||
RangeEnc_Init(&p->rc);
|
||||
- p->rc.outStream = &outStream.vt;
|
||||
|
||||
if (desiredPackSize == 0)
|
||||
return SZ_ERROR_OUTPUT_EOF;
|
||||
|
||||
+ p->rc.outStream = &outStream.vt;
|
||||
res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
|
||||
+ p->rc.outStream = NULL;
|
||||
|
||||
*unpackSize = (UInt32)(p->nowPos64 - nowPos64);
|
||||
*destLen -= outStream.rem;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From 7b005f344e533cd913c3ca05b266f9872df886d1 Mon Sep 17 00:00:00 2001
|
||||
From: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Date: Thu, 24 Mar 2022 20:04:34 +0800
|
||||
Subject: [PATCH] BaseTools: fix gcc12 warning
|
||||
|
||||
GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free]
|
||||
545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
GenFfs.c:544:5: note: call to ?fclose? here
|
||||
544 | fclose (InFileHandle);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/7b005f344e533cd913c3ca05b266f9872df886d1]
|
||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||||
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
|
||||
---
|
||||
BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
|
||||
BaseTools/Source/C/GenSec/GenSec.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
|
||||
index 949025c333..d78d62ab36 100644
|
||||
--- a/BaseTools/Source/C/GenFfs/GenFfs.c
|
||||
+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
|
||||
@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
|
||||
PeFileBuffer = (UINT8 *) malloc (PeFileSize);
|
||||
if (PeFileBuffer == NULL) {
|
||||
fclose (InFileHandle);
|
||||
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
||||
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
||||
diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
|
||||
index d54a4f9e0a..b1d05367ec 100644
|
||||
--- a/BaseTools/Source/C/GenSec/GenSec.c
|
||||
+++ b/BaseTools/Source/C/GenSec/GenSec.c
|
||||
@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
|
||||
PeFileBuffer = (UINT8 *) malloc (PeFileSize);
|
||||
if (PeFileBuffer == NULL) {
|
||||
fclose (InFileHandle);
|
||||
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
||||
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
require recipes-bsp/uefi/edk2-firmware_202202.bb
|
||||
require recipes-bsp/uefi/edk2-firmware_202205.bb
|
||||
PROVIDES:remove = "virtual/bootloader"
|
||||
|
||||
LICENSE += "& Apache-2.0"
|
||||
@@ -8,8 +8,6 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl
|
||||
git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
|
||||
file://shell.patch \
|
||||
file://use_bfd_linker.patch \
|
||||
file://0001-BaseTools-fix-gcc12-warning.patch \
|
||||
file://0001-BaseTools-fix-gcc12-warning-1.patch \
|
||||
"
|
||||
|
||||
SRCREV_acs = "ec02a7736ae5714326507c60595f4d5299e3dec8"
|
||||
|
||||
Reference in New Issue
Block a user