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

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index a8dfed163b472add784bbcd97b80f161c7b4c9c7..152a091c22f563606675ef9dbe0c5be5e10e83a3 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -1,8 +1,7 @@
 ## @file\r
+#  Simple CPU driver installs CPU Architecture Protocol.\r
 #\r
-#    Component description file for simple CPU driver\r
-#\r
-#  Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -16,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = CpuDxe\r
+  MODULE_UNI_FILE                = CpuDxe.uni\r
   FILE_GUID                      = 1A1E4886-9517-440e-9FDE-3BE44CEE2136\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
@@ -58,12 +58,14 @@
   X64/CpuAsm.S   | GCC\r
 \r
 [Protocols]\r
-  gEfiCpuArchProtocolGuid\r
+  gEfiCpuArchProtocolGuid                       ## PRODUCES\r
 \r
 [Guids]\r
-  gIdleLoopEventGuid                            ## CONSUMES ## GUID\r
-  gEfiVectorHandoffTableGuid                    ## CONSUMES ## Configuration Table\r
+  gIdleLoopEventGuid                            ## CONSUMES           ## Event\r
+  gEfiVectorHandoffTableGuid                    ## SOMETIMES_CONSUMES ## SystemTable\r
 \r
 [Depex]\r
   TRUE\r
 \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  CpuDxeExtra.uni\r

diff --git a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
index 8f0b283252774b3f02fe62b8b38c6a4ec47c9965..8ef8b3d31cffc96c85ec43bc340a53c27b9b8120 100644 (file)
--- a/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
+++ b/UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
@@ -1,9 +1,7 @@
 ## @file\r
-#  Produces the CPU I/O 2 Protocol.\r
+#  Produces the CPU I/O 2 Protocol by using the services of the I/O Library.\r
 #\r
-#  This DXE driver produces of the CPU I/O 2 Protocol, as introduced by PI 1.2.\r
-#\r
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = CpuIo2Dxe\r
+  MODULE_UNI_FILE                = CpuIo2Dxe.uni\r
   FILE_GUID                      = A19B1FE7-C1BC-49F8-875F-54A5D542443F\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0  \r
@@ -47,3 +46,6 @@
 \r
 [Depex]\r
   TRUE\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  CpuIo2DxeExtra.uni\r

diff --git a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
index e77b61f65526b20204088e9b9b5962703e47d3ac..d7c98f67c04aadfaaf6bf037f757eb879863422e 100644 (file)
--- a/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
+++ b/UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
@@ -1,7 +1,7 @@
 ## @file\r
-#  Module that produces the SMM CPU I/O 2 Protocol using the services of the I/O Library\r
+#  Produces the SMM CPU I/O 2 Protocol by using the services of the I/O Library.  \r
 #\r
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution. The full text of the license may be found at\r
@@ -14,6 +14,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = CpuIo2Smm\r
+  MODULE_UNI_FILE                = CpuIo2Smm.uni\r
   FILE_GUID                      = A47EE2D8-F60E-42fd-8E58-7BD65EE4C29B\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
@@ -42,7 +43,10 @@
   BaseMemoryLib\r
   \r
 [Protocols]\r
-  gEfiSmmCpuIo2ProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiSmmCpuIo2ProtocolGuid                   ## PRODUCES\r
 \r
 [Depex]\r
   TRUE\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  CpuIo2SmmExtra.uni\r

diff --git a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf b/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
index 4ebd9e2fb1e1f52d3fea8a962e4432cdaaa56767..b72ad6bfaf3931b3b9f964474d128160e13b7c73 100644 (file)
--- a/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
+++ b/UefiCpuPkg/CpuIoPei/CpuIoPei.inf
@@ -1,9 +1,7 @@
 ## @file\r
-#  Produces the CPU I/O PPI.\r
+#  Produces the CPU I/O PPI by using the services of the I/O Library.\r
 #\r
-#  This PEIM produces of the CPU I/O PPI.\r
-#\r
-# Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
 # which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = CpuIoPei\r
+  MODULE_UNI_FILE                = CpuIoPei.uni\r
   FILE_GUID                      = AE265864-CF5D-41a8-913D-71C155E76442\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0  \r
@@ -43,7 +42,10 @@
   PeiServicesLib\r
 \r
 [Ppis]\r
-  gEfiPeiCpuIoPpiInstalledGuid                  # PPI ALWAYS_PRODUCED\r
+  gEfiPeiCpuIoPpiInstalledGuid                  ## PRODUCES\r
 \r
 [Depex]\r
   TRUE\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  CpuIoPeiExtra.uni\r

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
index 2bc023fc23a41d33a31fab67ba32cd63f22d357f..7cf7d8ca80958a200f45cec9f94a9306c1a54a1c 100644 (file)
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
@@ -1,8 +1,9 @@
 ## @file\r
-#  This library defines some routines that are generic for IA32 family CPU\r
-#  to be UEFI specification compliant.\r
+#  This library defines some routines that are generic for IA32 family CPU.\r
 #\r
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  The library routines are UEFI specification compliant.\r
+#\r
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -16,6 +17,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = BaseUefiCpuLib\r
+  MODULE_UNI_FILE                = BaseUefiCpuLib.uni\r
   FILE_GUID                      = 34C24FD7-7A90-45c2-89FD-946473D9CE98\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
index 4257b157e7aea4f7412a4ea3fbf432fca9ae6100..839c311e1eeb228240fb547ec8e4f8d1ede24c92 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
+++ b/UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
@@ -1,7 +1,8 @@
 ## @file\r
-#  Component description file for CPU Local APIC Library.\r
+#  The Local Apic library supports xAPIC mode only.\r
 #\r
-#  This library instance supports xAPIC mode only.\r
+#  Note: Local APIC library assumes local APIC is enabled. It does not handle cases\r
+#  where local APIC is disabled.\r
 #\r
 #  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
@@ -17,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = BaseXApicLib\r
+  MODULE_UNI_FILE                = BaseXApicLib.uni\r
   FILE_GUID                      = D87CA0A8-1AC2-439b-90F8-EF4A2AC88DAF\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
@@ -42,4 +44,4 @@
   IoLib\r
 \r
 [Pcd]\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuInitIpiDelayInMicroSeconds\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuInitIpiDelayInMicroSeconds   ## SOMETIME_CONSUMES\r

diff --git a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
index bc6182d80dc1541179bbee32a64973db6b2f38f1..cb7a42e07221d7ec0c27721585caa64e5c836e8b 100644 (file)
--- a/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
+++ b/UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
@@ -1,8 +1,8 @@
 ## @file\r
-#  Component description file for CPU Local APIC Library.\r
+#  The Local Apic library supports x2APIC capable processors which have xAPIC and x2APIC modes.\r
 #\r
-#  This library instance supports x2APIC capable processors\r
-#  which have xAPIC and x2APIC modes.\r
+#  Note: Local APIC library assumes local APIC is enabled. It does not handle cases\r
+#  where local APIC is disabled.\r
 #\r
 #  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
@@ -18,6 +18,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = BaseXApicX2ApicLib\r
+  MODULE_UNI_FILE                = BaseXApicX2ApicLib.uni\r
   FILE_GUID                      = 967B6E05-F10D-4c10-8BF7-365291CA143F\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
@@ -43,5 +44,5 @@
   IoLib\r
 \r
 [Pcd]\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuInitIpiDelayInMicroSeconds\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuInitIpiDelayInMicroSeconds   ## SOMETIME_CONSUMES\r
 \r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
index b8bf4ebd17cc2dda74ef4750033e4fefa8ef86d8..0718afee72e8dbe606a2cc4bc8aea419159ac446 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
@@ -1,9 +1,7 @@
 ## @file\r
-#  Component description file for DXE CPU Exception Handler Library instance.\r
+#  CPU Exception Handler library instance for DXE modules.\r
 #\r
-#  This library instance supports DXE module only.\r
-#\r
-#  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = DxeCpuExceptionHandlerLib\r
+  MODULE_UNI_FILE                = DxeCpuExceptionHandlerLib.uni\r
   FILE_GUID                      = B6E9835A-EDCF-4748-98A8-27D3C722E02D\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
index 3d48f76ee0d3e9129399c8e0f2098f8f28f772af..0530a15024ea7ccf12f69b2aa0e148570f0a78d2 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
@@ -1,9 +1,7 @@
 ## @file\r
-#  Component description file for SEC/PEI CPU Exception Handler Library instance\r
+#  CPU Exception Handler library instance for SEC/PEI modules.\r
 #\r
-#  This library instance supports SEC/PEI module only.\r
-#\r
-#  Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SecPeiCpuExceptionHandlerLib\r
+  MODULE_UNI_FILE                = SecPeiCpuExceptionHandlerLib.uni\r
   FILE_GUID                      = CA4BBC99-DFC6-4234-B553-8B6586B7B113\r
   MODULE_TYPE                    = PEIM\r
   VERSION_STRING                 = 1.0\r
@@ -56,6 +55,3 @@
   PrintLib\r
   LocalApicLib\r
   PeCoffGetEntryPointLib\r
-\r
-[Ppis]\r
-  gEfiVectorHandoffInfoPpiGuid\r

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
index 2fe7ac3ca6009be76b30f542aad3cee1b4065408..582fc8a9cf4539d663b48155b797f53d17b7f8c6 100644 (file)
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
@@ -1,9 +1,7 @@
 ## @file\r
-#  Component description file for SMM CPU Exception Handler Library instance.\r
+#  CPU Exception Handler library instance for SMM modules.\r
 #\r
-#  This library instance supports SMM module only.\r
-#\r
-#  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SmmCpuExceptionHandlerLib\r
+  MODULE_UNI_FILE                = SmmCpuExceptionHandlerLib.uni\r
   FILE_GUID                      = 8D2C439B-3981-42ff-9CE5-1B50ECA502D6\r
   MODULE_TYPE                    = DXE_SMM_DRIVER\r
   VERSION_STRING                 = 1.0\r
@@ -59,6 +58,4 @@
   LocalApicLib\r
   PeCoffGetEntryPointLib\r
   DebugLib\r
- \r
-[Ppis]\r
-  gEfiVectorHandoffInfoPpiGuid\r
+\r

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf b/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
index e635752e8935d09668e73f5284c849704d1b2c5a..64ec9bd0b0fae5c9f3134121c0522d09e5747c17 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
@@ -1,5 +1,5 @@
 ## @file\r
-#  MTRR library provides API for MTRR operation\r
+#  MTRR library provides APIs for MTRR operation.\r
 #\r
 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
@@ -15,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = MtrrLib\r
+  MODULE_UNI_FILE                = MtrrLib.uni\r
   FILE_GUID                      = 6826b408-f4f3-47ee-917f-af7047f9d937\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r

diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
index e47b66262556b1089875421b34b20c11349919f5..ad54492df8ef307f456234278f6e2376f8f15251 100644 (file)
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
+++ b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
@@ -13,7 +13,7 @@
 # This library differs with the SecPeiDxeTimerLibCpu library in the MdePkg in\r
 # that it uses the local APIC library so that it supports x2APIC mode.\r
 #\r
-# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -28,6 +28,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = SecPeiDxeTimerLibUefiCpu\r
+  MODULE_UNI_FILE                = SecPeiDxeTimerLibUefiCpu.uni\r
   FILE_GUID                      = 4FFF2014-2086-4ee6-9B58-886D1967861C\r
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
@@ -62,5 +63,5 @@
 \r
 \r
 [Pcd.IA32, Pcd.X64]\r
-  gEfiMdePkgTokenSpaceGuid.PcdFSBClock  ## CONSUMES\r
+  gEfiMdePkgTokenSpaceGuid.PcdFSBClock  ## SOMETIME_CONSUMES\r
 \r

diff --git a/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf b/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf
index 2450bf6a7e623ed15eb1af81523e98a77bacbb81..ed41c3807d5cfab2fb01af05ab79b9f2d088160a 100644 (file)
--- a/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf
+++ b/UefiCpuPkg/ResetVector/FixupVtf/Vtf.inf
@@ -1,5 +1,7 @@
 ## @file\r
 #  Reset Vector\r
+#  \r
+#  This VTF requires build time fixups in order to find the SEC entry point.\r
 #\r
 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
@@ -18,6 +20,7 @@
   FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09\r
   MODULE_TYPE                    = SEC\r
   VERSION_STRING                 = 1.1\r
+  MODULE_UNI_FILE                = ResetVector.uni\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
@@ -30,3 +33,6 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  ResetVectorExtra.uni\r

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
index 63e1e2cf5649d3c76fe823aebf82a1280c4c47b8..72abd6e91c1162dd9cb40be7d2632df64c14b341 100644 (file)
--- a/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
+++ b/UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Reset Vector binary\r
 #\r
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -15,6 +15,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ResetVector\r
+  MODULE_UNI_FILE                = ResetVector.uni\r
   FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09\r
   MODULE_TYPE                    = SEC\r
   VERSION_STRING                 = 1.1\r
@@ -31,3 +32,5 @@
 [Binaries.X64]\r
   RAW|ResetVector.x64.raw|*\r
 \r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  ResetVectorExtra.uni\r

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf b/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
index fe2d9b3ce5f7c708abdb0b178d0eb9688550a690..41aba45a14ab539dcb8e1e0b780f414be5c248ff 100644 (file)
--- a/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
+++ b/UefiCpuPkg/ResetVector/Vtf0/Vtf0.inf
@@ -18,6 +18,7 @@
   FILE_GUID                      = 1BA0062E-C779-4582-8566-336AE8F78F09\r
   MODULE_TYPE                    = SEC\r
   VERSION_STRING                 = 1.1\r
+  MODULE_UNI_FILE                = ResetVector.uni\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
@@ -30,3 +31,6 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  ResetVectorExtra.uni\r

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 7575dbfd0dacc4bd606b719887eb44a5a0dad1fa..aa1c8032915879eae905b4bfc0dbecb1b938f6d8 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -1,5 +1,5 @@
 /** @file\r
-  This module produces the EFI_PEI_S3_RESUME_PPI.\r
+  This module produces the EFI_PEI_S3_RESUME2_PPI.\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

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 6b29d05c0745a66a8fda42aea7d676fec3606747..da68e2f9369b062d27913158a538fcb2fb915f56 100644 (file)
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -1,10 +1,11 @@
 ## @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 - 2012, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2014, Intel Corporation. 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 +20,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
@@ -66,25 +68,30 @@
   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
+  gPerformanceProtocolGuid                      ## SOMETIMES_CONSUMES ## Variable:L"PerfDataMemAddr"\r
+  ## SOMETIMES_CONSUMES ## HOB\r
+  ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\r
+  gEfiAcpiVariableGuid\r
+  gEfiAcpiS3ContextGuid                         ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox\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
+  gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES\r
+  gEfiPeiS3Resume2PpiGuid                       ## PRODUCES\r
+  gPeiSmmAccessPpiGuid                          ## SOMETIMES_CONSUMES\r
+  gPeiPostScriptTablePpiGuid                    ## SOMETIMES_PRODUCES\r
+  gEfiEndOfPeiSignalPpiGuid                     ## SOMETIMES_PRODUCES\r
 \r
 [FeaturePcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode         ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport  ## CONSUMES\r
 \r
 [Pcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable  ## SOMETIMES_CONSUMES\r
 \r
 [Depex]\r
   TRUE\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  S3Resume2PeiExtra.uni\r