From 3d50e76f0343014e0580f05904836f87bb92e468 Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Sun, 14 Sep 2025 21:16:31 -0700 Subject: [PATCH] UefiPayloadPkg: Drop ARM32 Support edk2 is dropping support for the ARM32 architecture. This commit removes ARM32 support from UefiPayloadPkg. It removes irrelevant VALID_ARCHITECTURES comments from infs that are not arch specific. Signed-off-by: Oliver Smith-Denny --- UefiPayloadPkg/Library/BuildFdtLib/BuildFdtLib.inf | 1 - UefiPayloadPkg/Library/FdtParserLib/FdtParseLib.inf | 1 - UefiPayloadPkg/Library/FmpDeviceSmmLib/FmpDeviceSmmLib.inf | 6 ------ UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf | 1 - UefiPayloadPkg/PciPlatformDxe/PciPlatformDxe.inf | 6 ------ UefiPayloadPkg/PlatformCI/PlatformBuild.py | 1 - 6 files changed, 16 deletions(-) diff --git a/UefiPayloadPkg/Library/BuildFdtLib/BuildFdtLib.inf b/UefiPayloadPkg/Library/BuildFdtLib/BuildFdtLib.inf index 12461a9606..db7f541510 100644 --- a/UefiPayloadPkg/Library/BuildFdtLib/BuildFdtLib.inf +++ b/UefiPayloadPkg/Library/BuildFdtLib/BuildFdtLib.inf @@ -59,7 +59,6 @@ MSFT:*_*_*_CC_FLAGS = /wd4305 GCC:*_*_IA32_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_X64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast - GCC:*_*_ARM_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_RISCV64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_LOONGARCH64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast diff --git a/UefiPayloadPkg/Library/FdtParserLib/FdtParseLib.inf b/UefiPayloadPkg/Library/FdtParserLib/FdtParseLib.inf index de3feba8ae..a5e83c2d7d 100644 --- a/UefiPayloadPkg/Library/FdtParserLib/FdtParseLib.inf +++ b/UefiPayloadPkg/Library/FdtParserLib/FdtParseLib.inf @@ -59,7 +59,6 @@ MSFT:*_*_*_CC_FLAGS = /wd4305 GCC:*_*_IA32_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_X64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast - GCC:*_*_ARM_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_RISCV64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_LOONGARCH64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast diff --git a/UefiPayloadPkg/Library/FmpDeviceSmmLib/FmpDeviceSmmLib.inf b/UefiPayloadPkg/Library/FmpDeviceSmmLib/FmpDeviceSmmLib.inf index 893e36170e..ea84cd5fdb 100644 --- a/UefiPayloadPkg/Library/FmpDeviceSmmLib/FmpDeviceSmmLib.inf +++ b/UefiPayloadPkg/Library/FmpDeviceSmmLib/FmpDeviceSmmLib.inf @@ -19,12 +19,6 @@ LIBRARY_CLASS = FmpDeviceLib|DXE_DRIVER UEFI_DRIVER CONSTRUCTOR = FmpDeviceSmmLibConstructor -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 -# - [Sources] FmpDeviceSmmLib.c diff --git a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf index 8db026eaa1..1040e01fd5 100644 --- a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf +++ b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.inf @@ -70,7 +70,6 @@ MSFT:*_*_*_CC_FLAGS = /wd4244 GCC:*_*_IA32_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_X64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast - GCC:*_*_ARM_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_AARCH64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_RISCV64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast GCC:*_*_LOONGARCH64_CC_FLAGS = -Wno-error=pointer-to-int-cast -Wno-error=int-to-pointer-cast diff --git a/UefiPayloadPkg/PciPlatformDxe/PciPlatformDxe.inf b/UefiPayloadPkg/PciPlatformDxe/PciPlatformDxe.inf index 9e0ba63de3..cd45f76674 100644 --- a/UefiPayloadPkg/PciPlatformDxe/PciPlatformDxe.inf +++ b/UefiPayloadPkg/PciPlatformDxe/PciPlatformDxe.inf @@ -16,12 +16,6 @@ VERSION_STRING = 1.0 ENTRY_POINT = InstallPciPlatformProtocol -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 -# - [Sources.common] PciPlatformDxe.h PciPlatformDxe.c diff --git a/UefiPayloadPkg/PlatformCI/PlatformBuild.py b/UefiPayloadPkg/PlatformCI/PlatformBuild.py index b25045870f..96c40fbe05 100644 --- a/UefiPayloadPkg/PlatformCI/PlatformBuild.py +++ b/UefiPayloadPkg/PlatformCI/PlatformBuild.py @@ -74,7 +74,6 @@ class SettingsManager(UpdateSettingsManager, SetupSettingsManager, PrEvalSetting ret = RunCmd("git", "config --file .gitmodules --get-regexp path", workingdir=self.GetWorkspaceRoot(), outstream=result) # Cmd output is expected to look like: # submodule.CryptoPkg/Library/OpensslLib/openssl.path CryptoPkg/Library/OpensslLib/openssl - # submodule.SoftFloat.path ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 if ret == 0: for line in result.getvalue().splitlines(): _, _, path = line.partition(" ")