From 7cf721dd4d5af623726e5b33de9a5513c0e1e31e Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Sun, 14 Sep 2025 21:17:49 -0700 Subject: [PATCH] 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 --- StandaloneMmPkg/Core/StandaloneMmCore.inf | 8 ++------ .../StandaloneMmCoreHobLib.inf | 3 --- .../StandaloneMmHobLib/StandaloneMmHobLib.inf | 4 ---- .../StandaloneMmMemLib/StandaloneMmMemLib.inf | 4 ++-- .../StandaloneMmMemoryAllocationLib.inf | 6 ------ .../StandaloneMmPeCoffExtraActionLib.inf | 2 +- .../VariableMmDependency/VariableMmDependency.inf | 7 ------- StandaloneMmPkg/StandaloneMmPkg.dsc | 12 ++++-------- 8 files changed, 9 insertions(+), 37 deletions(-) diff --git a/StandaloneMmPkg/Core/StandaloneMmCore.inf b/StandaloneMmPkg/Core/StandaloneMmCore.inf index bda86dc38a..0448cdaf4e 100644 --- a/StandaloneMmPkg/Core/StandaloneMmCore.inf +++ b/StandaloneMmPkg/Core/StandaloneMmCore.inf @@ -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 diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf index 070018c93a..d9bbad73ff 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf +++ b/StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf @@ -21,9 +21,6 @@ PI_SPECIFICATION_VERSION = 0x00010032 LIBRARY_CLASS = HobLib|MM_CORE_STANDALONE -# -# VALID_ARCHITECTURES = X64 AARCH64 ARM -# [Sources] Common.c StandaloneMmCoreHobLib.c diff --git a/StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf b/StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf index 537393c03c..5abeb98832 100644 --- a/StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf +++ b/StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf @@ -20,10 +20,6 @@ LIBRARY_CLASS = HobLib|MM_STANDALONE CONSTRUCTOR = HobLibConstructor -# -# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 -# - [Sources] StandaloneMmHobLib.c diff --git a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf index 4987deb8c9..cb1fcac176 100644 --- a/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf +++ b/StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf @@ -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] diff --git a/StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf b/StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf index f5aaff1a25..c88bf331db 100644 --- a/StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf +++ b/StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf @@ -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 diff --git a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf b/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf index 89083df679..02d4d8bc67 100644 --- a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf +++ b/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf @@ -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] diff --git a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf index ffb2a6d083..d229798ef7 100644 --- a/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf +++ b/StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf @@ -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 diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc index caf0b50780..a2268c2b0a 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -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