MdeModulePkg: remove PE/COFF header workaround for ELILO on IPF

[mirror_edk2.git] / MdeModulePkg / Core / PiSmmCore / PiSmmCore.inf

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index a01ef7ed57b73496e8b089bed3868c611765c82c..f3ece221216c9aa71a25665d0e73d4bc39b8b6b7 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -1,7 +1,7 @@
 ## @file\r
 # This module provide an SMM CIS compliant implementation of SMM Core.\r
 #\r
-# Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -40,31 +40,31 @@
   SmramProfileRecord.c\r
   MemoryAttributesTable.c\r
   SmiHandlerProfile.c\r
+  HeapGuard.c\r
+  HeapGuard.h\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  \r
+\r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r
   BaseLib\r
   BaseMemoryLib\r
   PeCoffLib\r
   PeCoffGetEntryPointLib\r
-  CacheMaintenanceLib  \r
+  CacheMaintenanceLib\r
   DebugLib\r
   ReportStatusCodeLib\r
-  DevicePathLib               \r
-  UefiLib                     \r
-  UefiBootServicesTableLib    \r
+  DevicePathLib\r
+  UefiLib\r
+  UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   PcdLib\r
   SmmCorePlatformHookLib\r
   PerformanceLib\r
-  TimerLib\r
   HobLib\r
   SmmMemLib\r
-  DxeServicesLib\r
 \r
 [Protocols]\r
   gEfiDxeSmmReadyToLockProtocolGuid             ## UNDEFINED # SmiHandlerRegister\r
@@ -79,7 +79,6 @@
   gEdkiiSmmExitBootServicesProtocolGuid         ## SOMETIMES_PRODUCES\r
   gEdkiiSmmLegacyBootProtocolGuid               ## SOMETIMES_PRODUCES\r
   gEdkiiSmmReadyToBootProtocolGuid              ## PRODUCES\r
-  gEdkiiSmmEndOfS3ResumeProtocolGuid            ## SOMETIMES_PRODUCES\r
 \r
   gEfiSmmSwDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES\r
   gEfiSmmSxDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES\r
@@ -89,6 +88,8 @@
   gEfiSmmGpiDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES\r
   gEfiSmmIoTrapDispatch2ProtocolGuid            ## SOMETIMES_CONSUMES\r
   gEfiSmmUsbDispatch2ProtocolGuid               ## SOMETIMES_CONSUMES\r
+  gEdkiiSmmMemoryAttributeProtocolGuid          ## CONSUMES\r
+  gEfiSmmSxDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressSmmCodePageNumber     ## SOMETIMES_CONSUMES\r
@@ -97,6 +98,9 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfilePropertyMask           ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfileDriverPath             ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSmiHandlerProfilePropertyMask       ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPageType                   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPoolType                   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask               ## CONSUMES\r
 \r
 [Guids]\r
   gAprioriGuid                                  ## SOMETIMES_CONSUMES   ## File\r
@@ -116,6 +120,8 @@
   ## SOMETIMES_PRODUCES   ## GUID # Install protocol\r
   ## SOMETIMES_PRODUCES   ## GUID # SmiHandlerRegister\r
   gSmiHandlerProfileGuid\r
+  gEdkiiEndOfS3ResumeGuid ## SOMETIMES_PRODUCES ## GUID # Install protocol\r
+  gEdkiiS3SmmInitDoneGuid ## SOMETIMES_PRODUCES ## GUID # Install protocol\r
 \r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   PiSmmCoreExtra.uni\r