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 da68e2f9369b062d27913158a538fcb2fb915f56..6ce1bf944c8f2e9956951e4de029482ff498f105 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -5,7 +5,8 @@
 # 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 - 2014, 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
@@ -36,12 +37,10 @@
   S3Resume.c\r
 \r
 [Sources.IA32]\r
-  Ia32/AsmFuncs.asm\r
-  Ia32/AsmFuncs.S    | GCC\r
+  Ia32/AsmFuncs.nasm\r
 \r
 [Sources.X64]\r
-  X64/AsmFuncs.asm\r
-  X64/AsmFuncs.S     | GCC\r
+  X64/AsmFuncs.nasm\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -54,7 +53,6 @@
   HobLib\r
   PeiServicesLib\r
   PeimEntryPoint\r
-  TimerLib\r
   BaseLib\r
   DebugLib\r
   PcdLib\r
@@ -65,23 +63,25 @@
   LocalApicLib\r
   ReportStatusCodeLib\r
   LockBoxLib\r
-  PrintLib\r
 \r
 [Guids]\r
   gEfiBootScriptExecutorVariableGuid            ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
   gEfiBootScriptExecutorContextGuid             ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
-  gPerformanceProtocolGuid                      ## SOMETIMES_CONSUMES ## Variable:L"PerfDataMemAddr"\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               ## CONSUMES\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         ## CONSUMES\r
@@ -89,6 +89,7 @@
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable  ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask    ## CONSUMES\r
 \r
 [Depex]\r
   TRUE\r