StandaloneMmPkg: Drop ARM32 Support

edk2 is dropping support for the ARM32 architecture. This commit
removes ARM32 code from StandaloneMmPkg. It also removes 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-14 21:17:49 -07:00 committed by mergify[bot]
parent 3d50e76f03
commit 7cf721dd4d
8 changed files with 9 additions and 37 deletions

View file

@ -17,8 +17,6 @@
PI_SPECIFICATION_VERSION = 0x00010032
ENTRY_POINT = StandaloneMmMain
# VALID_ARCHITECTURES = IA32 X64 AARCH64 ARM
[Sources]
StandaloneMmCore.c
StandaloneMmCore.h
@ -95,11 +93,9 @@
#
# This configuration fails for CLANGPDB, which does not support PIE in the GCC
# sense. Such however is required for ARM family StandaloneMmCore
# self-relocation, and thus the CLANGPDB toolchain is unsupported for ARM and
# AARCH64 for this module.
# self-relocation, and thus the CLANGPDB toolchain is unsupported for AARCH64
# for this module.
#
[BuildOptions]
GCC:*_*_ARM_CC_FLAGS = -fpie
GCC:*_*_ARM_DLINK_FLAGS = -Wl,-z,text,-Bsymbolic,-pie
GCC:*_*_AARCH64_CC_FLAGS = -fpie
GCC:*_*_AARCH64_DLINK_FLAGS = -Wl,-z,text,-Bsymbolic,-pie

View file

@ -21,9 +21,6 @@
PI_SPECIFICATION_VERSION = 0x00010032
LIBRARY_CLASS = HobLib|MM_CORE_STANDALONE
#
# VALID_ARCHITECTURES = X64 AARCH64 ARM
#
[Sources]
Common.c
StandaloneMmCoreHobLib.c

View file

@ -20,10 +20,6 @@
LIBRARY_CLASS = HobLib|MM_STANDALONE
CONSTRUCTOR = HobLibConstructor
#
# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64
#
[Sources]
StandaloneMmHobLib.c

View file

@ -28,7 +28,7 @@
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64 AARCH64 ARM
# VALID_ARCHITECTURES = IA32 X64 AARCH64
#
[Sources.Common]
@ -38,7 +38,7 @@
[Sources.IA32, Sources.X64]
X86StandaloneMmMemLibInternal.c
[Sources.AARCH64, Sources.ARM]
[Sources.AARCH64]
ArmStandaloneMmMemLibInternal.c
[Packages]

View file

@ -18,12 +18,6 @@
PI_SPECIFICATION_VERSION = 0x00010032
LIBRARY_CLASS = MemoryAllocationLib|MM_STANDALONE
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64
#
[Sources]
StandaloneMmMemoryAllocationLib.c

View file

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

View file

@ -17,13 +17,6 @@
LIBRARY_CLASS = NULL
CONSTRUCTOR = VariableMmDependencyLibConstructor
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = AARCH64|ARM
#
#
[Sources]
VariableMmDependency.c

View file

@ -20,7 +20,7 @@
PLATFORM_VERSION = 1.0
DSC_SPECIFICATION = 0x00010011
OUTPUT_DIRECTORY = Build/StandaloneMm
SUPPORTED_ARCHITECTURES = AARCH64|X64|ARM
SUPPORTED_ARCHITECTURES = AARCH64|X64
BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
@ -74,7 +74,7 @@
[LibraryClasses.X64]
StandaloneMmCoreEntryPoint|MdePkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
[LibraryClasses.AARCH64, LibraryClasses.ARM]
[LibraryClasses.AARCH64]
ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
StandaloneMmCoreEntryPoint|ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf
StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
@ -88,7 +88,7 @@
HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
[LibraryClasses.AARCH64.MM_CORE_STANDALONE, LibraryClasses.ARM.MM_CORE_STANDALONE]
[LibraryClasses.AARCH64.MM_CORE_STANDALONE]
ArmFfaLib|MdeModulePkg/Library/ArmFfaLib/ArmFfaStandaloneMmCoreLib.inf
[LibraryClasses.common.MM_STANDALONE]
@ -152,7 +152,7 @@
StandaloneMmPkg/Drivers/MmCommunicationNotifyDxe/MmCommunicationNotifyDxe.inf
StandaloneMmPkg/Library/StandaloneMmExtractGuidedSectionLib/StandaloneMmExtractGuidedSectionLib.inf
[Components.AARCH64, Components.ARM]
[Components.AARCH64]
StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf
[Components.X64]
@ -171,10 +171,6 @@
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp -mstrict-align
GCC:*_*_*_CC_FLAGS = -mstrict-align
[BuildOptions.ARM]
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv7-a
GCC:*_*_*_CC_FLAGS = -fno-stack-protector
[BuildOptions.X64]
MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000