OvmfPkg: Drop ARM32 Support

edk2 is dropping support for the ARM32 architecture. This
commit removes ARM32 code from OvmfPkg. This drops irrelevant
VALID_ARCHITECTURES comments from infs that are not arch
specific.

Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
This commit is contained in:
Oliver Smith-Denny 2025-09-15 08:53:51 -07:00 committed by mergify[bot]
parent 2ba9441e0b
commit c6ff778056
26 changed files with 12 additions and 126 deletions

View file

@ -14,12 +14,6 @@
VERSION_STRING = 1.0
ENTRY_POINT = AcpiPlatformEntryPoint
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = X64 ARM AARCH64
#
[Sources]
AcpiPlatform.c
AcpiPlatform.h

View file

@ -18,12 +18,6 @@
ENTRY_POINT = SmbiosTablePublishEntry
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = X64 EBC ARM AARCH64
#
[Sources]
Bhyve.c
SmbiosPlatformDxe.h

View file

@ -428,7 +428,7 @@ PciHostBridgeGetRootBridges (
} else {
//
// UEFI mandates a 1:1 virtual-to-physical mapping, so on a 32-bit
// architecture such as ARM, we will not be able to access 64-bit MMIO
// architecture, we will not be able to access 64-bit MMIO
// BARs unless they are allocated below 4 GB. So ignore the range above
// 4 GB in this case.
//

View file

@ -16,13 +16,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = PciHostBridgeLib
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = AARCH64 ARM RISCV64
#
[Sources]
FdtPciHostBridgeLib.c

View file

@ -20,7 +20,7 @@
#if defined (MDE_CPU_X64)
#include "arch-x86/xen.h"
#elif defined (__arm__) || defined (__aarch64__)
#elif defined (__aarch64__)
#include "arch-arm/xen.h"
#else
#error "Unsupported architecture"

View file

@ -20,10 +20,6 @@
LIBRARY_CLASS = PciExpressLib|DXE_DRIVER UEFI_DRIVER UEFI_APPLICATION
CONSTRUCTOR = PciExpressLibInitialize
#
# VALID_ARCHITECTURES = ARM AARCH64 RISCV64
#
[Sources]
PciExpressLib.c

View file

@ -19,13 +19,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = PciHostBridgeUtilityLib
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = X64 AARCH64 ARM
#
[Sources]
PciHostBridgeUtilityLib.c

View file

@ -20,7 +20,7 @@
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = ARM AARCH64
# VALID_ARCHITECTURES = AARCH64
#
[Sources]

View file

@ -16,13 +16,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = QemuBootOrderLib|DXE_DRIVER
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = X64 EBC ARM AARCH64
#
[Sources]
ExtraRootBusMap.c
ExtraRootBusMap.h

View file

@ -20,13 +20,6 @@
CONSTRUCTOR = QemuFwCfgInitialize
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = ARM AARCH64 RISCV64 LOONGARCH64
#
[Sources]
QemuFwCfgLibMmio.c
QemuFwCfgMmioDxe.c

View file

@ -19,13 +19,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = QemuFwCfgS3Lib
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 EBC
#
[Sources]
QemuFwCfgS3Base.c
QemuFwCfgS3BasePei.c

View file

@ -15,13 +15,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = QemuFwCfgS3Lib|DXE_DRIVER DXE_RUNTIME_DRIVER
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = X64 ARM AARCH64 EBC
#
[Sources]
QemuFwCfgS3Dxe.c
QemuFwCfgS3PeiDxe.c

View file

@ -18,13 +18,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = QemuFwCfgS3Lib|PEIM
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 EBC
#
[Sources]
QemuFwCfgS3BasePei.c
QemuFwCfgS3Pei.c

View file

@ -20,13 +20,6 @@
LIBRARY_CLASS = SmbiosVersionLib|DXE_DRIVER
CONSTRUCTOR = DetectSmbiosVersion
#
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = X64 ARM AARCH64
#
[Sources]
DetectSmbiosVersionLib.c

View file

@ -24,7 +24,7 @@
# The following information is for reference only and not required by the build
# tools.
#
# VALID_ARCHITECTURES = X64 ARM AARCH64
# VALID_ARCHITECTURES = X64 AARCH64
#
[Sources]

View file

@ -1,22 +0,0 @@
/** @file
ARM (AArch32) implementation of XenHypercall2
Copyright (C) 2014, Linaro Ltd.
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include <IndustryStandard/Xen/arch-arm/xen.h>
.text
.arch_extension virt
GCC_ASM_EXPORT(XenHypercall2)
ASM_PFX(XenHypercall2):
mov r12, r0
mov r0, r1
mov r1, r2
hvc #XEN_HYPERCALL_TAG
bx lr

View file

@ -18,7 +18,7 @@
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = X64 ARM AARCH64
# VALID_ARCHITECTURES = X64 AARCH64
#
[Sources.X64]
@ -27,12 +27,9 @@
[Sources.X64]
X64/hypercall.nasm
[Sources.ARM, Sources.AARCH64]
[Sources.AARCH64]
ArmXenHypercall.c
[Sources.ARM]
Arm/Hypercall.S
[Sources.AARCH64]
AArch64/Hypercall.S

View file

@ -19,10 +19,6 @@
UNLOAD_IMAGE = LinuxInitrdDynamicShellCommandUnload
UEFI_HII_RESOURCE_SECTION = TRUE
#
# VALID_ARCHITECTURES = X64 ARM AARCH64 EBC
#
[Sources.common]
LinuxInitrdDynamicShellCommand.c
LinuxInitrdDynamicShellCommand.uni

View file

@ -54,7 +54,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(" ")

View file

@ -207,7 +207,7 @@ if __name__ == '__main__':
parser.add_argument (
'-a', '--arch', dest = 'Arch', nargs = '+', action = 'append',
required = True,
help = '''ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64, RISCV64
help = '''ARCHS is one of list: IA32, X64, IPF, AARCH64, RISCV64
or EBC, which overrides target.txt's TARGET_ARCH definition.
To specify more archs, please repeat this option.'''
)

View file

@ -17,12 +17,6 @@
VERSION_STRING = 1.0
LIBRARY_CLASS = FmpDeviceLib|DXE_DRIVER UEFI_DRIVER
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = X64 ARM AARCH64 RISCV64
#
[Sources]
FmpDeviceLib.c

View file

@ -1,5 +1,5 @@
/** @file
Detect Xen SMBIOS data on ARM / AARCH64.
Detect Xen SMBIOS data on AARCH64.
Copyright (C) 2015, Red Hat, Inc.
Copyright (c) 2011, Bei Guan <gbtju85@gmail.com>

View file

@ -17,12 +17,6 @@
ENTRY_POINT = SmbiosTablePublishEntry
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = X64 EBC ARM AARCH64
#
[Sources]
CloudHv.c
EntryPoint.c

View file

@ -21,7 +21,7 @@
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = X64 EBC ARM AARCH64
# VALID_ARCHITECTURES = X64 EBC AARCH64
#
[Sources]
@ -33,7 +33,7 @@
[Sources.X64]
X86Xen.c
[Sources.ARM, Sources.AARCH64]
[Sources.AARCH64]
ArmXen.c
[Packages]

View file

@ -52,5 +52,5 @@
[Depex.IA32, Depex.X64]
gOvmfTpmMmioAccessiblePpiGuid
[Depex.ARM, Depex.AARCH64]
[Depex.AARCH64]
gOvmfTpmDiscoveredPpiGuid

View file

@ -50,7 +50,7 @@
[Depex.IA32, Depex.X64]
gOvmfTpmMmioAccessiblePpiGuid
[Depex.ARM, Depex.AARCH64]
[Depex.AARCH64]
gOvmfTpmDiscoveredPpiGuid
[Depex.RISCV64]