MdeModulePkg: Change the default IPv4 config policy

[mirror_edk2.git] / OvmfPkg / AcpiS3SaveDxe / AcpiS3SaveDxe.inf

diff --git a/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf b/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
index fd26a05d368bb0f1a63155b62791074b9de510a2..a288b954b7918964ddc054bcc104e49404647635 100644 (file)
--- a/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
+++ b/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
@@ -1,7 +1,6 @@
 ## @file\r
-# Component description file for AcpiS3Save module.\r
+# AcpiS3Save module installs EndOfDxe callback to prepare S3 boot data.\r
 #\r
-# This is an implementation of the ACPI S3 Save protocol.\r
 # Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are\r
@@ -21,7 +20,7 @@
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
 \r
-  ENTRY_POINT                    = InstallAcpiS3Save\r
+  ENTRY_POINT                    = InstallEndOfDxeCallback\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
@@ -30,7 +29,6 @@
 #\r
 \r
 [Sources]\r
-  AcpiS3Save.h\r
   AcpiS3Save.c\r
 \r
 [Packages]\r
@@ -38,6 +36,7 @@
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  OvmfPkg/OvmfPkg.dec\r
 \r
 [LibraryClasses]\r
   PcdLib\r
@@ -50,30 +49,29 @@
   LockBoxLib\r
   DebugLib\r
   DxeServicesLib\r
+  QemuFwCfgLib\r
 \r
 [Guids]\r
   gEfiAcpiVariableGuid                          # ALWAYS_CONSUMED\r
   gEfiAcpiS3ContextGuid                         # ALWAYS_CONSUMED\r
   gEfiAcpi20TableGuid                           # ALWAYS_CONSUMED  System Table\r
   gEfiAcpi10TableGuid                           # ALWAYS_CONSUMED  System Table\r
+  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES  ## Event\r
 \r
 [Protocols]\r
-  gEfiAcpiS3SaveProtocolGuid                    # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiLockBoxProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiLockBoxProtocolGuid                       # PROTOCOL SOMETIMES_PRODUCED\r
   gEfiLegacyBiosProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
   gEfiLegacyRegion2ProtocolGuid                 # PROTOCOL SOMETIMES_CONSUMED\r
   gFrameworkEfiMpServiceProtocolGuid            # PROTOCOL SOMETIMES_CONSUMED\r
-  gEfiS3SaveStateProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiDxeSmmReadyToLockProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [FeaturePcd]\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformCsmSupport          ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
 \r
 [Pcd]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize    ## CONSUMES\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize       ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire                            ## CONSUMES\r
 \r
 [Depex]\r
-  gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid AND gEfiS3SaveStateProtocolGuid\r
+  gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid\r