X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UefiCpuPkg%2FUniversal%2FAcpi%2FS3Resume2Pei%2FS3Resume2Pei.inf;h=47fecd7d6d800fd0f1571c8cb6f31dfc1b5270df;hp=db5d66e7fbd7799d837021ccf7003338687f2f0a;hb=5b29e438ebee883c781a2831baede501c3293569;hpb=abef469fc1969f1142bf8add4275d573b4793e94

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