Correct minor comments in meta data file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7697 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf b/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
index 00a8e63ac4d182fda9ae7e2eeaf88b1b553dc263..bbc8f0b56c7785a8867cc9520c470448b174a5fa 100644 (file)
--- a/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
+++ b/MdeModulePkg/Application/HelloWorld/HelloWorld.inf
@@ -54,5 +54,5 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintEnable\r
 \r
 [Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintEnable\r
 \r
 [Pcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintString  ## Valid when gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintEnable\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintTimes   ## Valid when gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintEnable\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintString || PcdHelloWorldPrintEnable  ## Valid when gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintEnable\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintTimes  || PcdHelloWorldPrintEnable  ## Valid when gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintEnable\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 0adb7783b7fa0ae39780ea4e097e12cc94e67aae..52b0bf21cac491e4aa430006eb315dcc7f41116c 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -49,8 +49,8 @@
   PeiMain.h\r
 \r
 [Packages]\r
   PeiMain.h\r
 \r
 [Packages]\r

-  MdeModulePkg/MdeModulePkg.dec\r

   MdePkg/MdePkg.dec\r
   MdePkg/MdePkg.dec\r

+  MdeModulePkg/MdeModulePkg.dec\r

 \r
 [LibraryClasses]\r
   TimerLib\r
 \r
 [LibraryClasses]\r
   TimerLib\r


@@ -70,29 +70,29 @@
   \r
 \r
 [Guids]\r
   \r
 \r
 [Guids]\r

-  gPeiAprioriFileNameGuid  ## SOMETIMES_CONSUMES ## GUID\r
-  gEfiFirmwareFileSystem2Guid ## SOMETIMES_CONSUME ## FV\r
+  gPeiAprioriFileNameGuid     ## CONSUMES ## GUID\r
+  gEfiFirmwareFileSystem2Guid ## CONSUMES ## FV\r

 \r
 [Ppis]\r
 \r
 [Ppis]\r

-  gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES\r
-  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES\r
+  gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES (PeiReportStatusService is not ready if this PPI doesn't exist)\r
+  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES (PeiResetService is not ready if this PPI doesn't exist) \r

   gEfiDxeIplPpiGuid                             ## CONSUMES\r
   gEfiDxeIplPpiGuid                             ## CONSUMES\r

-  gEfiPeiMemoryDiscoveredPpiGuid                ## CONSUMES\r
+  gEfiPeiMemoryDiscoveredPpiGuid                ## PRODUCES\r

   gEfiPeiDecompressPpiGuid                      ## CONSUMES\r
   gEfiPeiDecompressPpiGuid                      ## CONSUMES\r

-  gEfiPeiFirmwareVolumeInfoPpiGuid              ## CONSUMES\r
-  gEfiPeiLoadFilePpiGuid                        ## CONSUMES\r
-  gEfiPeiSecurity2PpiGuid                       ## CONSUMES\r
+  gEfiPeiFirmwareVolumeInfoPpiGuid              ## NOTIFY   ## SOMETIMES_PRODUCES (Produce FvInfoPpi if the encapsulated FvImage is found) \r
+  gEfiPeiLoadFilePpiGuid                        ## PRODUCES ## SOMETIMES_CONSUMES (The default load PeImage logic will be used when this PPI doesn't exist)\r
+  gEfiPeiSecurity2PpiGuid                       ## NOTIFY\r

   gEfiTemporaryRamSupportPpiGuid                ## CONSUMES\r
 \r
 [FixedPcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported       ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv         ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported      ## CONSUMES\r
   gEfiTemporaryRamSupportPpiGuid                ## CONSUMES\r
 \r
 [FixedPcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported       ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv         ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported      ## CONSUMES\r

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch      ## SOMETIMES_CONSUMES\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry       ## SOMETIMES_CONSUMES\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch          ## CONSUMES\r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry       ## CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize      ## CONSUMES\r
 \r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize      ## CONSUMES\r
 \r
 [FeaturePcd.common]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst   ## CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport               ## CONSUMES\r
   
\ No newline at end of file
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport               ## CONSUMES\r
   
\ No newline at end of file

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index 3e0d992cc19febbbb5bcc9e7325bf49c178a8491..8aadd1af85c9c472f4c49ea6cc25a138e46bd8c1 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -2,10 +2,10 @@
 #  \r
 #  Capsule Runtime Driver produces two UEFI capsule runtime services.\r
 #  (UpdateCapsule, QueryCapsuleCapabilities)\r
 #  \r
 #  Capsule Runtime Driver produces two UEFI capsule runtime services.\r
 #  (UpdateCapsule, QueryCapsuleCapabilities)\r

-#  It installs the Capsule Architectural Protocol (EDKII extension definition) to signify \r
+#  It installs the Capsule Architectural Protocol defined in PI1.0a to signify \r

 #  the capsule runtime services are ready.\r
 #  \r
 #  the capsule runtime services are ready.\r
 #  \r

-#  Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
+#  Copyright (c) 2006 - 2009, Intel Corporation. <BR>\r

 #  All rights reserved. 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
 #  All rights reserved. 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


@@ -57,7 +57,7 @@
 \r
 [FixedPcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule\r
 \r
 [FixedPcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule || PcdSupportUpdateCapsuleReset  ## Populate Image requires reset support.\r

 \r
 [Depex]\r
   gEfiVariableWriteArchProtocolGuid             ## Depends on variable write functionality to produce capsule data variable\r
 \r
 [Depex]\r
   gEfiVariableWriteArchProtocolGuid             ## Depends on variable write functionality to produce capsule data variable\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 33ca5057fe219aa37a51c1820606fde2a353aeb8..f0e82ae602872a5b43d43795621e4ae64448fa68 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
@@ -1,7 +1,7 @@
 /** @file\r
   Capsule Runtime Driver produces two UEFI capsule runtime services.\r
   (UpdateCapsule, QueryCapsuleCapabilities)\r
 /** @file\r
   Capsule Runtime Driver produces two UEFI capsule runtime services.\r
   (UpdateCapsule, QueryCapsuleCapabilities)\r

-  It installs the Capsule Architectural Protocol (EDKII definition) to signify \r
+  It installs the Capsule Architectural Protocol defined in PI1.0a to signify \r

   the capsule runtime services are ready.\r
 \r
 Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
   the capsule runtime services are ready.\r
 \r
 Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r