mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-10-15 05:17:14 +00:00
edk2: update to edk2-stable202608
Update edk2 and edk2-platforms from edk2-stable202605 to edk2-stable202608 tags. Add a backport for the SmbiosType2Generator clang build failure introduced by the newer edk2 release. Remove the same patch from RDN2 and RDV2, where it is not applicable because those platforms use an older SHA-based edk2 release. Update SBSA-ACS to use the new edk2 release. Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
1 parent
231cfdefd2
commit
52a0a3656d
7 files changed
+53
-7
No files matched your search
@@ -11,6 +11,7 @@ SRC_URI_EDK2_PLATFORMS = "git://gitlab.arm.com/infra-solutions/reference-design/
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
|
||||
SRC_URI:append = " file://0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch;patchdir=edk2-platforms"
|
||||
SRC_URI:remove = "file://0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch"
|
||||
|
||||
SRCBRANCH_edk2 = "refinfra"
|
||||
SRCBRANCH_edk2_platforms = "refinfra"
|
||||
|
||||
@@ -11,6 +11,7 @@ SRC_URI_EDK2_PLATFORMS = "git://gitlab.arm.com/infra-solutions/reference-design/
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
|
||||
SRC_URI:append = " file://0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch;patchdir=edk2-platforms"
|
||||
SRC_URI:remove = "file://0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch"
|
||||
|
||||
SRCBRANCH_edk2 = "refinfra"
|
||||
SRCBRANCH_edk2_platforms = "refinfra"
|
||||
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
# SRCREV_brotli must be kept in sync with the brotli submodule commit that
|
||||
# the pinned edk2 SRCREV declares in its .gitmodules. Update it whenever
|
||||
# the edk2 SRCREV is bumped.
|
||||
# edk2-stable202602 (b7a715f7): brotli e230f474
|
||||
# edk2-stable202608 (b7a715f7): brotli e230f474
|
||||
|
||||
SUMMARY = "EDK2 Base Tools"
|
||||
LICENSE = "BSD-2-Clause-Patent"
|
||||
@@ -17,7 +17,7 @@ SRC_URI = " \
|
||||
"
|
||||
LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a"
|
||||
|
||||
SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b"
|
||||
SRCREV = "2970e5699ba6267f3384ffab20f96647578aebc8"
|
||||
SRCREV_brotli = "e230f474b87134e8c6c85b630084c612057f253e"
|
||||
SRCREV_FORMAT = "default_brotli"
|
||||
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
From 7d2f6b6e31fad2c96c6fc55c17e79f8c96b4bfcf Mon Sep 17 00:00:00 2001
|
||||
From: Yeoreum Yun <yeoreum.yun@arm.com>
|
||||
Date: Mon, 10 Aug 2026 15:40:06 +0100
|
||||
Subject: [PATCH] DynamicTablesPkg: fix SmbiosType2Genertor build failure with
|
||||
clang
|
||||
|
||||
BaseboardCount type is UINT32. Using MAX_UINTN in the comparision
|
||||
triggers below build error:
|
||||
|
||||
type 'UINT32' (aka 'unsigned int') is always false
|
||||
[-Werror,-Wtautological-constant-out-of-range-compare]
|
||||
199 | (BaseboardCount > (MAX_UINTN / sizeof (*CmObjectList))))
|
||||
|
||||
To address this, use MAX_UINT32 instead of MAX_UINTN.
|
||||
|
||||
Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
|
||||
|
||||
Upstream-Status: Backport [7d2f6b6e31fad2c96c6fc55c17e79f8c96b4bfcf]
|
||||
Signed-off-by: Jon Mason <jon.mason@arm.com>
|
||||
---
|
||||
.../Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c b/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c
|
||||
index 1250ef8059e9..5345d2b6d233 100644
|
||||
--- a/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c
|
||||
+++ b/DynamicTablesPkg/Library/Smbios/SmbiosType2Lib/SmbiosType2Generator.c
|
||||
@@ -195,8 +195,8 @@ BuildSmbiosType2TableEx (
|
||||
}
|
||||
|
||||
if ((BaseboardInfo == NULL) ||
|
||||
- (BaseboardCount > (MAX_UINTN / sizeof (*TableList))) ||
|
||||
- (BaseboardCount > (MAX_UINTN / sizeof (*CmObjectList))))
|
||||
+ (BaseboardCount > (MAX_UINT32 / sizeof (*TableList))) ||
|
||||
+ (BaseboardCount > (MAX_UINT32 / sizeof (*CmObjectList))))
|
||||
{
|
||||
DEBUG ((DEBUG_ERROR, "%a: Invalid Baseboard object list\n", __func__));
|
||||
return EFI_INVALID_PARAMETER;
|
||||
--
|
||||
2.39.5
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
require recipes-bsp/uefi/edk2-firmware.inc
|
||||
|
||||
SRCREV_edk2 ?= "b03a21a63e3bd001f52c527e5a57feddb53a690b"
|
||||
SRCREV_edk2-platforms ?= "04470160f67192c53ec9192e0e8460d183fe49ec"
|
||||
@@ -0,0 +1,7 @@
|
||||
require recipes-bsp/uefi/edk2-firmware.inc
|
||||
|
||||
SRCREV_edk2 ?= "2970e5699ba6267f3384ffab20f96647578aebc8"
|
||||
SRCREV_edk2-platforms ?= "c98cdf8de9bd84a3267623e64f4388e21de69512"
|
||||
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
|
||||
SRC_URI += "file://0001-DynamicTablesPkg-fix-SmbiosType2Genertor-build-failu.patch"
|
||||
@@ -1,4 +1,4 @@
|
||||
require recipes-bsp/uefi/edk2-firmware_202605.bb
|
||||
require recipes-bsp/uefi/edk2-firmware_202608.bb
|
||||
PROVIDES:remove = "virtual/bootloader"
|
||||
|
||||
LICENSE += "AND Apache-2.0"
|
||||
|
||||
Reference in new issue
Block a user