mirror of
				https://gitlab.com/qemu-project/edk2.git
				synced 2025-10-30 07:56:39 +08:00 
			
		
		
		
	MdeModulePkg: Remove ARM32 Support
edk2 is dropping support for the ARM32 architecture. This commit removes ARM32 support from MdeModulePkg. This also drops irrelevant VALID_ARCHITECTURE 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
					Oliver Smith-Denny
				
			
				
					committed by
					
						![mergify[bot]](/assets/img/avatar_default.png) mergify[bot]
						mergify[bot]
					
				
			
			
				
	
			
			
			![mergify[bot]](/assets/img/avatar_default.png) mergify[bot]
						mergify[bot]
					
				
			
						parent
						
							80de048c1b
						
					
				
				
					commit
					ef79d58427
				
			| @ -25,16 +25,6 @@ | ||||
|  | ||||
|   ENTRY_POINT                    = EhcDriverEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  gEhciDriverBinding | ||||
| #  COMPONENT_NAME                =  gEhciComponentName | ||||
| #  COMPONENT_NAME2               =  gEhciComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   UsbHcMem.h | ||||
|   EhciUrb.c | ||||
|  | ||||
| @ -18,16 +18,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   ENTRY_POINT                    = PciBusEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  gPciBusDriverBinding | ||||
| #  COMPONENT_NAME                =  gPciBusComponentName | ||||
| #  COMPONENT_NAME2               =  gPciBusComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   PciLib.c | ||||
|   PciIo.c | ||||
|  | ||||
| @ -15,16 +15,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   ENTRY_POINT                    = InitializeSataControllerDriver | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  gSataControllerDriverBinding | ||||
| #  COMPONENT_NAME                =  gSataControllerComponentName | ||||
| #  COMPONENT_NAME2               =  gSataControllerComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   ComponentName.c | ||||
|   SataController.c | ||||
|  | ||||
| @ -20,16 +20,6 @@ | ||||
|  | ||||
|   ENTRY_POINT                    = UhciDriverEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  gUhciDriverBinding | ||||
| #  COMPONENT_NAME                =  gUhciComponentName | ||||
| #  COMPONENT_NAME2               =  gUhciComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   UhciSched.c | ||||
|   UhciDebug.c | ||||
|  | ||||
| @ -21,16 +21,6 @@ | ||||
|  | ||||
|   ENTRY_POINT                    = XhcDriverEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  gXhciDriverBinding | ||||
| #  COMPONENT_NAME                =  gXhciComponentName | ||||
| #  COMPONENT_NAME2               =  gXhciComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   Xhci.c | ||||
|   XhciReg.c | ||||
|  | ||||
| @ -18,16 +18,6 @@ | ||||
|  | ||||
|   ENTRY_POINT                    = UsbBusDriverEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  mUsbBusDriverBinding | ||||
| #  COMPONENT_NAME                =  mUsbBusComponentName | ||||
| #  COMPONENT_NAME2               =  mUsbBusComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   UsbDesc.c | ||||
|   UsbEnumer.c | ||||
|  | ||||
| @ -28,16 +28,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   ENTRY_POINT                    = USBKeyboardDriverBindingEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
| #  DRIVER_BINDING                =  gUsbKeyboardDriverBinding | ||||
| #  COMPONENT_NAME                =  gUsbKeyboardComponentName | ||||
| #  COMPONENT_NAME2               =  gUsbKeyboardComponentName2 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   EfiKey.c | ||||
|   EfiKey.h | ||||
|  | ||||
| @ -77,13 +77,12 @@ typedef struct { | ||||
| } MACHINE_TYPE_INFO; | ||||
|  | ||||
| GLOBAL_REMOVE_IF_UNREFERENCED MACHINE_TYPE_INFO  mMachineTypeInfo[] = { | ||||
|   { EFI_IMAGE_MACHINE_IA32,           L"IA32"        }, | ||||
|   { EFI_IMAGE_MACHINE_IA64,           L"IA64"        }, | ||||
|   { EFI_IMAGE_MACHINE_X64,            L"X64"         }, | ||||
|   { EFI_IMAGE_MACHINE_ARMTHUMB_MIXED, L"ARM"         }, | ||||
|   { EFI_IMAGE_MACHINE_AARCH64,        L"AARCH64"     }, | ||||
|   { EFI_IMAGE_MACHINE_RISCV64,        L"RISCV64"     }, | ||||
|   { EFI_IMAGE_MACHINE_LOONGARCH64,    L"LOONGARCH64" }, | ||||
|   { EFI_IMAGE_MACHINE_IA32,        L"IA32"        }, | ||||
|   { EFI_IMAGE_MACHINE_IA64,        L"IA64"        }, | ||||
|   { EFI_IMAGE_MACHINE_X64,         L"X64"         }, | ||||
|   { EFI_IMAGE_MACHINE_AARCH64,     L"AARCH64"     }, | ||||
|   { EFI_IMAGE_MACHINE_RISCV64,     L"RISCV64"     }, | ||||
|   { EFI_IMAGE_MACHINE_LOONGARCH64, L"LOONGARCH64" }, | ||||
| }; | ||||
|  | ||||
| UINT16  mDxeCoreImageMachineType = 0; | ||||
|  | ||||
| @ -45,7 +45,7 @@ | ||||
|   X64/VirtualMemory.c | ||||
|   X64/DxeLoadFunc.c | ||||
|  | ||||
| [Sources.LOONGARCH64,Sources.RISCV64,Sources.EBC,Sources.ARM,Sources.AARCH64] | ||||
| [Sources.LOONGARCH64,Sources.RISCV64,Sources.EBC,Sources.AARCH64] | ||||
|   DxeHandoff.c | ||||
|  | ||||
| [Packages] | ||||
| @ -108,7 +108,7 @@ | ||||
|   gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase                            ## CONSUMES | ||||
|   gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize                            ## CONSUMES | ||||
|  | ||||
| [Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64] | ||||
| [Pcd.IA32,Pcd.X64,Pcd.AARCH64] | ||||
|   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy ## SOMETIMES_CONSUMES | ||||
|   gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy       ## SOMETIMES_CONSUMES | ||||
|  | ||||
|  | ||||
| @ -18,11 +18,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   LIBRARY_CLASS                  = HobLib | ||||
|  | ||||
|  | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   BaseHobLibNull.c | ||||
|  | ||||
|  | ||||
| @ -18,11 +18,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   LIBRARY_CLASS                  = MemoryAllocationLib | ||||
|  | ||||
|  | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   BaseMemoryAllocationLibNull.c | ||||
|  | ||||
|  | ||||
| @ -22,12 +22,6 @@ | ||||
|   LIBRARY_CLASS                  = NULL | ||||
|   CONSTRUCTOR                    = LzmaDecompressLibConstructor | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 AARCH64 ARM | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   LzmaDecompress.c | ||||
|   Sdk/C/LzFind.c | ||||
|  | ||||
| @ -19,12 +19,6 @@ | ||||
|   MODULE_TYPE                    = USER_DEFINED | ||||
|   VERSION_STRING                 = 1.0 | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 RISCV64 LOONGARCH64 | ||||
| # | ||||
|  | ||||
| [Binaries] | ||||
|   BIN|Logo.bmp|* | ||||
|  | ||||
|  | ||||
| @ -985,7 +985,7 @@ | ||||
|   # @Prompt Enable process non-reset capsule image at runtime. | ||||
|   gEfiMdeModulePkgTokenSpaceGuid.PcdSupportProcessCapsuleAtRuntime|FALSE|BOOLEAN|0x00010079 | ||||
|  | ||||
| [PcdsFeatureFlag.IA32, PcdsFeatureFlag.ARM, PcdsFeatureFlag.AARCH64, PcdsFeatureFlag.LOONGARCH64] | ||||
| [PcdsFeatureFlag.IA32, PcdsFeatureFlag.AARCH64, PcdsFeatureFlag.LOONGARCH64] | ||||
|   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDegradeResourceForOptionRom|FALSE|BOOLEAN|0x0001003a | ||||
|  | ||||
| [PcdsFeatureFlag.IA32, PcdsFeatureFlag.X64] | ||||
|  | ||||
| @ -16,7 +16,7 @@ | ||||
|   PLATFORM_VERSION               = 0.98 | ||||
|   DSC_SPECIFICATION              = 0x00010005 | ||||
|   OUTPUT_DIRECTORY               = Build/MdeModule | ||||
|   SUPPORTED_ARCHITECTURES        = IA32|X64|EBC|ARM|AARCH64|RISCV64|LOONGARCH64 | ||||
|   SUPPORTED_ARCHITECTURES        = IA32|X64|EBC|AARCH64|RISCV64|LOONGARCH64 | ||||
|   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT | ||||
|   SKUID_IDENTIFIER               = DEFAULT | ||||
|  | ||||
| @ -182,7 +182,7 @@ | ||||
|   VarCheckHiiLibMmDependency|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibMmDependency.inf | ||||
|   VarCheckHiiLib|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLibStandaloneMm.inf | ||||
|  | ||||
| [LibraryClasses.ARM, LibraryClasses.AARCH64] | ||||
| [LibraryClasses.AARCH64] | ||||
|   LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf | ||||
|   ArmSmcLib|MdePkg/Library/ArmSmcLib/ArmSmcLib.inf | ||||
|   ArmSvcLib|MdePkg/Library/ArmSvcLib/ArmSvcLib.inf | ||||
| @ -460,7 +460,7 @@ | ||||
|   MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf | ||||
|   MdeModulePkg/Universal/EbcDxe/EbcDebuggerConfig.inf | ||||
|  | ||||
| [Components.IA32, Components.X64, Components.ARM, Components.AARCH64] | ||||
| [Components.IA32, Components.X64, Components.AARCH64] | ||||
|   MdeModulePkg/Library/BrotliCustomDecompressLib/BrotliCustomDecompressLib.inf | ||||
|   MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf | ||||
|   MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf | ||||
| @ -533,7 +533,7 @@ | ||||
| [Components.X64] | ||||
|   MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf | ||||
|  | ||||
| [Components.ARM, Components.AARCH64] | ||||
| [Components.AARCH64] | ||||
|   MdeModulePkg/Library/ArmFfaLib/ArmFfaSecLib.inf | ||||
|   MdeModulePkg/Library/ArmFfaLib/ArmFfaPeiLib.inf | ||||
|   MdeModulePkg/Library/ArmFfaLib/ArmFfaDxeLib.inf | ||||
|  | ||||
| @ -23,23 +23,23 @@ | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 RISCV64 LOONGARCH64 | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC AARCH64 RISCV64 LOONGARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   CapsuleService.c | ||||
|   CapsuleService.h | ||||
|  | ||||
| [Sources.Ia32, Sources.EBC, Sources.ARM, Sources.AARCH64, Sources.RISCV64, Sources.LOONGARCH64] | ||||
| [Sources.Ia32, Sources.EBC, Sources.AARCH64, Sources.RISCV64, Sources.LOONGARCH64] | ||||
|   SaveLongModeContext.c | ||||
|  | ||||
| [Sources.Ia32, Sources.X64, Sources.ARM, Sources.AARCH64, Sources.RISCV64, Sources.LOONGARCH64] | ||||
| [Sources.Ia32, Sources.X64, Sources.AARCH64, Sources.RISCV64, Sources.LOONGARCH64] | ||||
|   CapsuleCache.c | ||||
|  | ||||
| [Sources.Ia32, Sources.X64, Sources.EBC, Sources.RISCV64, Sources.LOONGARCH64] | ||||
|   CapsuleReset.c | ||||
|  | ||||
| [Sources.ARM, Sources.AARCH64] | ||||
| [Sources.AARCH64] | ||||
|   Arm/CapsuleReset.c | ||||
|  | ||||
| [Sources.EBC] | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| /** @file | ||||
|   Create the NULL function to pass build in IA32/IPF/ARM/EBC. | ||||
|   Create the NULL function to pass build in IA32/IPF/EBC. | ||||
|  | ||||
| Copyright (c) 2011, Intel Corporation. All rights reserved.<BR> | ||||
| SPDX-License-Identifier: BSD-2-Clause-Patent | ||||
|  | ||||
| @ -17,12 +17,6 @@ | ||||
|   ENTRY_POINT               = RamDiskDxeEntryPoint | ||||
|   UNLOAD_IMAGE              = RamDiskDxeUnload | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES      = IA32 X64 ARM AARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   RamDiskDriver.c | ||||
|   RamDiskImpl.c | ||||
|  | ||||
| @ -22,12 +22,6 @@ | ||||
|   PI_SPECIFICATION_VERSION       = 0x00010032 | ||||
|   ENTRY_POINT                    = StandaloneMmFaultTolerantWriteInitialize | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   FtwMisc.c | ||||
|   UpdateWorkingBlock.c | ||||
|  | ||||
| @ -110,7 +110,6 @@ realloc ( | ||||
|   return NULL; | ||||
| } | ||||
|  | ||||
| #if !defined (MDE_CPU_ARM) | ||||
| void * | ||||
| memcpy ( | ||||
|   void          *dest, | ||||
| @ -121,8 +120,6 @@ memcpy ( | ||||
|   return CopyMem (dest, src, (UINTN)count); | ||||
| } | ||||
|  | ||||
| #endif | ||||
|  | ||||
| void * | ||||
| memset ( | ||||
|   void          *dest, | ||||
|  | ||||
| @ -38,7 +38,7 @@ typedef INT64   ptrdiff_t; | ||||
| #define offsetof  OFFSET_OF | ||||
| #endif | ||||
|  | ||||
| #if defined (MDE_CPU_IA32) || defined (MDE_CPU_ARM) || defined (MDE_CPU_EBC) | ||||
| #if defined (MDE_CPU_IA32) || defined (MDE_CPU_EBC) | ||||
| #define SIZEOF_VOIDP  4 | ||||
| #else | ||||
| #define SIZEOF_VOIDP  8 | ||||
| @ -108,7 +108,6 @@ realloc ( | ||||
|   size_t  size | ||||
|   ); | ||||
|  | ||||
| #if !defined (MDE_CPU_ARM) | ||||
| void * | ||||
| memcpy ( | ||||
|   void          *dest, | ||||
| @ -116,8 +115,6 @@ memcpy ( | ||||
|   unsigned int  count | ||||
|   ); | ||||
|  | ||||
| #endif | ||||
|  | ||||
| void * | ||||
| memset ( | ||||
|   void          *dest, | ||||
|  | ||||
| @ -18,12 +18,6 @@ | ||||
|  | ||||
|   ENTRY_POINT                    = SmbiosDriverEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   SmbiosDxe.h | ||||
|   SmbiosDxe.c | ||||
|  | ||||
| @ -27,12 +27,6 @@ | ||||
|   VERSION_STRING                 = 1.0 | ||||
|   ENTRY_POINT                    = SmbiosMeasurementDriverEntryPoint | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 EBC ARM AARCH64 | ||||
| # | ||||
|  | ||||
| [Sources] | ||||
|   SmbiosMeasurementDxe.c | ||||
|  | ||||
|  | ||||
| @ -34,13 +34,6 @@ | ||||
|   PI_SPECIFICATION_VERSION       = 0x00010032 | ||||
|   ENTRY_POINT                    = VariableServiceInitialize | ||||
|  | ||||
| # | ||||
| # The following information is for reference only and not required by the build tools. | ||||
| # | ||||
| #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64 | ||||
| # | ||||
|  | ||||
|  | ||||
| [Sources] | ||||
|   Reclaim.c | ||||
|   Variable.c | ||||
|  | ||||
		Reference in New Issue
	
	Block a user