Correct ExtractGuidedSectionLib library instance for PEIM and DXE

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

6 files changed, 11 insertions, 8 deletions

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index afea03ec47..fd4b5e3dcc 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -44,7 +44,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf

   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf

   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf

-  ExtractGuidedSectionLib|MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf

 

 [LibraryClasses.IA32]

   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf

@@ -85,6 +84,7 @@
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf

   SmBusLib|MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf

   PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf

+  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

   

 [LibraryClasses.common.DXE_CORE]

   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf

@@ -95,6 +95,7 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

 [LibraryClasses.common.DXE_DRIVER]

   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf

diff --git a/MdePkg/Include/Library/ExtractGuidedSectionLib.h b/MdePkg/Include/Library/ExtractGuidedSectionLib.h
index 193acc3280..27faeeceb0 100644
--- a/MdePkg/Include/Library/ExtractGuidedSectionLib.h
+++ b/MdePkg/Include/Library/ExtractGuidedSectionLib.h
@@ -152,7 +152,7 @@ ExtractGuidedSectionGetInfo (
                             A pointer to a caller-allocated UINT32 that indicates the

                             authentication status of the output buffer. 
 
-  @retval  RETURN_SUCCESS           Get the output data, size and AuthenticationStatus successfully.

+  @retval  RETURN_SUCCESS           Get the output data and AuthenticationStatus successfully.

   @retval  RETURN_UNSUPPORTED       Guided section data is not supported to be decoded.

   @retval  RETURN_INVALID_PARAMETER The input data can't be parsed correctly.
 **/

diff --git a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
index 8da4c794bc..e61291dbdd 100644
--- a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
@@ -1,7 +1,7 @@
 #/** @file

-# Component description file for DxeCore Performance Library

+# Component description file for DXE ExtractGuidedSection Library

 #

-# This library provides intrastructure for DxeCore to log performance.

+# This library provides generic extract guided section functions for DXE module.

 # Copyright (c) 2007, Intel Corporation.

 #

 #  All rights reserved. This program and the accompanying materials

diff --git a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
index fb6e3d136c..c80ea1c9d8 100644
--- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
@@ -1,7 +1,7 @@
 #/** @file

-# Component description file for DxeCore Performance Library

+# Component description file for PEIM ExtractGuidedSection Library

 #

-# This library provides intrastructure for DxeCore to log performance.

+# This library provides generic extract guided section functions for PEIM and PEI_CORE module.

 # Copyright (c) 2007, Intel Corporation.

 #

 #  All rights reserved. This program and the accompanying materials

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index b1382daacf..0f05fb1ab5 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -104,7 +104,8 @@
   MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf

   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

   MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

-  MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf

+  MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

+  MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

 [Components.IA32]

   MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 70bed1618d..08a624fba5 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -67,7 +67,6 @@
   HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf

   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf

   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf

-  ExtractGuidedSectionLib|MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf

   

 [LibraryClasses.common.BASE]

   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

@@ -95,6 +94,7 @@
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   PeCoffLib|Nt32Pkg/Library/DxeNT32PeCoffLib/DxeNT32PeCoffLib.inf

+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf

 

 [LibraryClasses.common.DXE_SMM_DRIVER]

   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf

@@ -128,6 +128,7 @@
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf

   PeCoffLib|Nt32Pkg/Library/PeiNT32PeCoffLib/PeiNT32PeCoffLib.inf

   PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf

+  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf

   

 [LibraryClasses.common.PEI_CORE]

   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf