X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FCore%2FDxeIplPeim%2FDxeIpl.inf;h=f39251f3c90949e24b6e6f3fe6e24ab0909c11cc;hb=890e54170e8f85d1357ac3614f7ad1465050ff0c;hp=d48a0a08666aae0a56703cbba38626ef8ae7caf0;hpb=31f228cfc08f62203c69d75f7e0e2d1215e34df2;p=mirror_edk2.git

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index d48a0a0866..f39251f3c9 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -1,20 +1,20 @@
-#/** @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 - 2009, Intel Corporation. <BR>
-#  All rights reserved. This program and the accompanying materials
+#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  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
 #  http://opensource.org/licenses/bsd-license.php
-#  
+#
 #  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,21 +31,21 @@
 #  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  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  X64/VirtualMemory.c  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
   Ia32/DxeLoadFunc.c
-  Ia32/IdtVectorAsm.asm||||PcdDxeIplSwitchToLongMode
-  Ia32/IdtVectorAsm.S  ||||PcdDxeIplSwitchToLongMode
+  Ia32/IdtVectorAsm.asm||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  Ia32/IdtVectorAsm.S  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
 
 [Sources.X64]
   X64/VirtualMemory.h
   X64/VirtualMemory.c
-  X64/DxeLoadFunc.c
+  X64/DxeLoadFunc.c    
 
 [Sources.IPF]
   Ipf/DxeLoadFunc.c
@@ -72,6 +72,8 @@
   BaseLib
   PeimEntryPoint
   DebugLib
+  DebugAgentLib
+  PeiServicesTablePointerLib
 
 [Ppis]
   gEfiDxeIplPpiGuid                 ## PRODUCES
@@ -79,7 +81,7 @@
   gEfiPeiDecompressPpiGuid          ## SOMETIMES_PRODUCES
   gEfiPeiReadOnlyVariable2PpiGuid   ## SOMETIMES_CONSUMES
   gEfiPeiLoadFilePpiGuid            ## CONSUMES
-  gEfiPeiS3ResumePpiGuid            ## SOMETIMES_CONSUMES(Consumed on S3 boot path)
+  gEfiPeiS3Resume2PpiGuid           ## SOMETIMES_CONSUMES(Consumed on S3 boot path)
   gEfiPeiRecoveryModulePpiGuid      ## SOMETIMES_CONSUMES(Consumed on recovery boot path)
 
 [Guids]
@@ -89,21 +91,24 @@
 [FeaturePcd.IA32]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
 
-[FeaturePcd.common]
+[FeaturePcd.X64]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildPageTables
+
+[FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress
 
-[FixedPcd.common]
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiHandoffToDxe
+[Pcd.IA32,Pcd.X64]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
 
 [Depex]
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid
+  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid AND gEfiPeiMasterBootModePpiGuid
 
 #
-# [BootMode] 
+# [BootMode]
 #   S3_RESUME                       ## SOMETIMES_CONSUMES
 #   RECOVERY                        ## SOMETIMES_CONSUMES
 #
-#  
+#
 # [Hob]
 #   ##
 #   # New Stack HoB
@@ -117,4 +122,4 @@
 #   # BSP Stack HOB for IPF
 #   MEMORY_ALLOCATION               ## PRODUCES
 #
-# 
+#