X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxeIplPeim%2FDxeIpl.inf;h=0fcaf44f570125b9a3c2c939eaa158d0def6f68a;hp=6e2eab8a04a279611bd237142535df0b009dd7d0;hb=53f32495953afac85b4c85c52dcf0595a4b1999e;hpb=873b7997efe978eab9b8fc9d41e6fe9baf35d127

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 6e2eab8a04..0fcaf44f57 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -1,11 +1,11 @@
-#/** @file
+## @file
 #  Last PEIM executed in PEI phase to load DXE Core from a Firmware Volume.
 #  
 #  This module produces a special PPI named the DXE Initial Program Load (IPL)
 #  PPI to discover and dispatch the DXE Foundation and components that are
 #  needed to run the DXE Foundation.
 #
-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>
+#  Copyright (c) 2006 - 2010, Intel Corporation. <BR>
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -14,7 +14,7 @@
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #  
-#**/
+##
 
 [Defines]
   INF_VERSION                    = 0x00010005
@@ -31,15 +31,14 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)
 #
 
-[Sources.common]
+[Sources]
   DxeIpl.h
   DxeLoad.c
 
 [Sources.Ia32]
-  Ia32/VirtualMemory.h ||||PcdDxeIplSwitchToLongMode
-  Ia32/VirtualMemory.c ||||PcdDxeIplSwitchToLongMode
+  X64/VirtualMemory.h  ||||PcdDxeIplSwitchToLongMode
+  X64/VirtualMemory.c  ||||PcdDxeIplSwitchToLongMode
   Ia32/DxeLoadFunc.c
-  Ia32/ImageRead.c
   Ia32/IdtVectorAsm.asm||||PcdDxeIplSwitchToLongMode
   Ia32/IdtVectorAsm.S  ||||PcdDxeIplSwitchToLongMode
 
@@ -47,42 +46,41 @@
   X64/VirtualMemory.h
   X64/VirtualMemory.c
   X64/DxeLoadFunc.c
-  Ia32/ImageRead.c
 
 [Sources.IPF]
   Ipf/DxeLoadFunc.c
-  Ipf/ImageRead.c
 
 [Sources.EBC]
   Ebc/DxeLoadFunc.c
-  Ia32/ImageRead.c
+
+[Sources.ARM]
+  Arm/DxeLoadFunc.c
 
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  PeCoffLib
   PcdLib
   MemoryAllocationLib
   BaseMemoryLib
   ExtractGuidedSectionLib
   UefiDecompressLib
-  CacheMaintenanceLib
   ReportStatusCodeLib
   PeiServicesLib
   HobLib
   BaseLib
   PeimEntryPoint
   DebugLib
-  S3Lib
-  RecoveryLib
 
 [Ppis]
   gEfiDxeIplPpiGuid                 ## PRODUCES
   gEfiEndOfPeiSignalPpiGuid         ## SOMETIMES_PRODUCES(Not produced on S3 boot path)
   gEfiPeiDecompressPpiGuid          ## SOMETIMES_PRODUCES
   gEfiPeiReadOnlyVariable2PpiGuid   ## SOMETIMES_CONSUMES
+  gEfiPeiLoadFilePpiGuid            ## CONSUMES
+  gEfiPeiS3ResumePpiGuid            ## SOMETIMES_CONSUMES(Consumed on S3 boot path)
+  gEfiPeiRecoveryModulePpiGuid      ## SOMETIMES_CONSUMES(Consumed on recovery boot path)
 
 [Guids]
   gEfiMemoryTypeInformationGuid     ## SOMETIMES_CONSUMES ## Variable:L"MemoryTypeInformation"
@@ -91,14 +89,11 @@
 [FeaturePcd.IA32]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
 
-[FeaturePcd.common]
+[FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress
 
-[FixedPcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiHandoffToDxe
-
 [Depex]
-  gEfiPeiMemoryDiscoveredPpiGuid
+  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid
 
 #
 # [BootMode]