Clean up DEC files:

[mirror_edk2.git] / MdeModulePkg / Core / DxeIplPeim / DxeIpl.inf

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 90e7f9be96730b4163ac41152239fa39882c6f50..5c5f7e82a57216312b17cf9972e368a908ba0890 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -1,20 +1,20 @@
-#/** @file\r
+## @file\r
 #  Last PEIM executed in PEI phase to load DXE Core from a Firmware Volume.\r
-#  \r
+#\r
 #  This module produces a special PPI named the DXE Initial Program Load (IPL)\r
 #  PPI to discover and dispatch the DXE Foundation and components that are\r
 #  needed to run the DXE Foundation.\r
 #\r
-#  Copyright (c) 2006 - 2010, Intel Corporation. <BR>\r
-#  All rights reserved. This program and the accompanying materials\r
+#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+#  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
-#  \r
+#\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#  \r
-#**/\r
+#\r
+##\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
@@ -31,16 +31,16 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC (EBC is for build only)\r
 #\r
 \r
-[Sources.common]\r
+[Sources]\r
   DxeIpl.h\r
   DxeLoad.c\r
 \r
 [Sources.Ia32]\r
-  X64/VirtualMemory.h  ||||PcdDxeIplSwitchToLongMode\r
-  X64/VirtualMemory.c  ||||PcdDxeIplSwitchToLongMode\r
+  X64/VirtualMemory.h  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
+  X64/VirtualMemory.c  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
   Ia32/DxeLoadFunc.c\r
-  Ia32/IdtVectorAsm.asm||||PcdDxeIplSwitchToLongMode\r
-  Ia32/IdtVectorAsm.S  ||||PcdDxeIplSwitchToLongMode\r
+  Ia32/IdtVectorAsm.asm||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
+  Ia32/IdtVectorAsm.S  ||||gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
 \r
 [Sources.X64]\r
   X64/VirtualMemory.h\r
@@ -72,6 +72,7 @@
   BaseLib\r
   PeimEntryPoint\r
   DebugLib\r
+  DebugAgentLib\r
 \r
 [Ppis]\r
   gEfiDxeIplPpiGuid                 ## PRODUCES\r
@@ -79,7 +80,7 @@
   gEfiPeiDecompressPpiGuid          ## SOMETIMES_PRODUCES\r
   gEfiPeiReadOnlyVariable2PpiGuid   ## SOMETIMES_CONSUMES\r
   gEfiPeiLoadFilePpiGuid            ## CONSUMES\r
-  gEfiPeiS3ResumePpiGuid            ## SOMETIMES_CONSUMES(Consumed on S3 boot path)\r
+  gEfiPeiS3Resume2PpiGuid           ## SOMETIMES_CONSUMES(Consumed on S3 boot path)\r
   gEfiPeiRecoveryModulePpiGuid      ## SOMETIMES_CONSUMES(Consumed on recovery boot path)\r
 \r
 [Guids]\r
@@ -89,18 +90,18 @@
 [FeaturePcd.IA32]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
 \r
-[FeaturePcd.common]\r
+[FeaturePcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress\r
 \r
 [Depex]\r
-  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid\r
+  gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid AND gEfiPeiMasterBootModePpiGuid\r
 \r
 #\r
-# [BootMode] \r
+# [BootMode]\r
 #   S3_RESUME                       ## SOMETIMES_CONSUMES\r
 #   RECOVERY                        ## SOMETIMES_CONSUMES\r
 #\r
-#  \r
+#\r
 # [Hob]\r
 #   ##\r
 #   # New Stack HoB\r
@@ -114,4 +115,4 @@
 #   # BSP Stack HOB for IPF\r
 #   MEMORY_ALLOCATION               ## PRODUCES\r
 #\r
-# \r
+#\r