summaryrefslogtreecommitdiffstats
path: root/UefiCpuPkg/Universal/Acpi/S3Resume2Pei
diff options
context:
space:
mode:
authorGao, Liming <liming.gao@intel.com>2014-08-28 05:09:12 +0000
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-28 05:09:12 +0000
commite48e07424a72a2bdaa8dfe46198facaca02051d6 (patch)
treeb0c18664c8954446508b4257e8557c4dc0ed75ad /UefiCpuPkg/Universal/Acpi/S3Resume2Pei
parented395cfecd7abddf69fc124799817a5a12a991d4 (diff)
downloadedk2-e48e07424a72a2bdaa8dfe46198facaca02051d6.tar.gz
edk2-e48e07424a72a2bdaa8dfe46198facaca02051d6.tar.bz2
edk2-e48e07424a72a2bdaa8dfe46198facaca02051d6.zip
UefiCpuPkg: INF/DEC file updates to EDK II packages
1. Usage information in INF file comment blocks are either incomplete or incorrect. This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes. The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Gao, Liming <liming.gao@intel.com> Reviewed-by: Michael Kinney <michael.d.kinney@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15933 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UefiCpuPkg/Universal/Acpi/S3Resume2Pei')
-rw-r--r--UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c2
-rw-r--r--UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf37
2 files changed, 23 insertions, 16 deletions
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 7575dbfd0d..aa1c803291 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -1,5 +1,5 @@
/** @file
- This module produces the EFI_PEI_S3_RESUME_PPI.
+ This module produces the 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.
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 6b29d05c07..da68e2f936 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -1,10 +1,11 @@
## @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 - 2014, Intel Corporation. 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 +20,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
@@ -66,25 +68,30 @@
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
+ gPerformanceProtocolGuid ## SOMETIMES_CONSUMES ## Variable:L"PerfDataMemAddr"
+ ## SOMETIMES_CONSUMES ## HOB
+ ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox
+ gEfiAcpiVariableGuid
+ gEfiAcpiS3ContextGuid ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox
[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
[FeaturePcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
- gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport
+ gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUMES
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONSUMES
[Pcd]
- gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
+ gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES
[Depex]
TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+ S3Resume2PeiExtra.uni