UefiCpuPkg: Remove redundant library classes, Ppis and GUIDs

[mirror_edk2.git] / UefiCpuPkg / Universal / Acpi / S3Resume2Pei / S3Resume2Pei.inf

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 58e239825a14b7e9f9d4a28459ed63b5542ef012..6ce1bf944c8f2e9956951e4de029482ff498f105 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -1,10 +1,12 @@
 ## @file\r
-# S3 Resume Module:\r
+# S3 Resume Module installs EFI_PEI_S3_RESUME2_PPI.\r
+#\r
 # This module works with StandAloneBootScriptExecutor to S3 resume to OS.\r
 # This module will excute the boot script saved during last boot and after that,\r
 # control is passed to OS waking up handler.\r
 #\r
-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are\r
 # licensed and made available under the terms and conditions of the BSD License\r
@@ -19,6 +21,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = S3Resume2Pei\r
+  MODULE_UNI_FILE                = S3Resume2Pei.uni\r
   FILE_GUID                      = 89E549B0-7CFE-449d-9BA3-10D8B2312D71\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
@@ -33,6 +36,12 @@
 [Sources]\r
   S3Resume.c\r
 \r
+[Sources.IA32]\r
+  Ia32/AsmFuncs.nasm\r
+\r
+[Sources.X64]\r
+  X64/AsmFuncs.nasm\r
+\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
@@ -44,7 +53,6 @@
   HobLib\r
   PeiServicesLib\r
   PeimEntryPoint\r
-  TimerLib\r
   BaseLib\r
   DebugLib\r
   PcdLib\r
@@ -55,25 +63,36 @@
   LocalApicLib\r
   ReportStatusCodeLib\r
   LockBoxLib\r
-  PrintLib\r
 \r
 [Guids]\r
-  gEfiBootScriptExecutorVariableGuid            # SOMETIMES_CONSUMED\r
-  gEfiBootScriptExecutorContextGuid             # SOMETIMES_CONSUMED\r
-  gPerformanceProtocolGuid                      # ALWAYS_CONSUMED L"PerfDataMemAddr"\r
-  gEfiAcpiVariableGuid                          # ALWAYS_CONSUMED  Hob: GUID_EXTENSION\r
-  gEfiAcpiS3ContextGuid                         # ALWAYS_CONSUMED\r
+  gEfiBootScriptExecutorVariableGuid            ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
+  gEfiBootScriptExecutorContextGuid             ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
+  ## SOMETIMES_CONSUMES ## HOB\r
+  ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
+  gEfiAcpiVariableGuid\r
+  gEfiAcpiS3ContextGuid                         ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
+  gEdkiiEndOfS3ResumeGuid                       ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication\r
+  ## SOMETIMES_PRODUCES ## UNDEFINED # Install PPI\r
+  ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication\r
+  gEdkiiS3SmmInitDoneGuid\r
 \r
 [Ppis]\r
-  gEfiPeiReadOnlyVariable2PpiGuid                # PPI ALWAYS_CONSUMED\r
-  gEfiPeiS3Resume2PpiGuid                        # PPI ALWAYS_PRODUCED\r
-  gPeiSmmAccessPpiGuid                           # PPI ALWAYS_CONSUMED\r
-  gPeiPostScriptTablePpiGuid                     # PPI ALWAYS_PRODUCED\r
-  gEfiEndOfPeiSignalPpiGuid                      # PPI ALWAYS_PRODUCED\r
+  gEfiPeiS3Resume2PpiGuid                       ## PRODUCES\r
+  gPeiSmmAccessPpiGuid                          ## SOMETIMES_CONSUMES\r
+  gPeiPostScriptTablePpiGuid                    ## SOMETIMES_PRODUCES\r
+  gEfiEndOfPeiSignalPpiGuid                     ## SOMETIMES_PRODUCES\r
+  gEfiPeiSmmCommunicationPpiGuid                ## SOMETIMES_CONSUMES\r
 \r
 [FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode         ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport  ## CONSUMES\r
+\r
+[Pcd]\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable  ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiPeiReadOnlyVariable2PpiGuid\r
+  TRUE\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  S3Resume2PeiExtra.uni\r