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

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index afea03ec4777d0187205155244a360ccd7733bd7..fd4b5e3dcc023229f8ce87d5bc1aa2003f80f007 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -44,7 +44,6 @@
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf\r
   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf\r
-  ExtractGuidedSectionLib|MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf\r
 \r
 [LibraryClasses.IA32]\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
@@ -85,6 +84,7 @@
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
   SmBusLib|MdePkg/Library/PeiSmbusLibSmbus2Ppi/PeiSmbusLibSmbus2Ppi.inf\r
   PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf\r
+  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf\r
   \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
@@ -95,6 +95,7 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf\r
 \r
 [LibraryClasses.common.DXE_DRIVER]\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r

diff --git a/MdePkg/Include/Library/ExtractGuidedSectionLib.h b/MdePkg/Include/Library/ExtractGuidedSectionLib.h
index 193acc3280ccd23b14170c8e595ca09e4bfdf6e0..27faeeceb02bd4e303d15c3a7c9640884341d47f 100644 (file)
--- 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\r
                             authentication status of the output buffer. 
 
-  @retval  RETURN_SUCCESS           Get the output data, size and AuthenticationStatus successfully.\r
+  @retval  RETURN_SUCCESS           Get the output data and AuthenticationStatus successfully.\r
   @retval  RETURN_UNSUPPORTED       Guided section data is not supported to be decoded.\r
   @retval  RETURN_INVALID_PARAMETER The input data can't be parsed correctly.
 **/\r

diff --git a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
index 8da4c794bcbb1a680e53fb278e9b28ea8c0b9b75..e61291dbdd72cb31ce7ad85be7beb77b43e58803 100644 (file)
--- a/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
@@ -1,7 +1,7 @@
 #/** @file\r
-# Component description file for DxeCore Performance Library\r
+# Component description file for DXE ExtractGuidedSection Library\r
 #\r
-# This library provides intrastructure for DxeCore to log performance.\r
+# This library provides generic extract guided section functions for DXE module.\r
 # Copyright (c) 2007, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r

diff --git a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
index fb6e3d136c0162e76ed767966c7e111be7f4fa37..c80ea1c9d8eef41f71fe69dc69ab7dfb19f5936d 100644 (file)
--- a/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
+++ b/MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
@@ -1,7 +1,7 @@
 #/** @file\r
-# Component description file for DxeCore Performance Library\r
+# Component description file for PEIM ExtractGuidedSection Library\r
 #\r
-# This library provides intrastructure for DxeCore to log performance.\r
+# This library provides generic extract guided section functions for PEIM and PEI_CORE module.\r
 # Copyright (c) 2007, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index b1382daacfcc304e4223e811f655f46548a26ad5..0f05fb1ab5442e58f55bc8824eece7e7f3258827 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -104,7 +104,8 @@
   MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf\r
   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
-  MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf\r
+  MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf\r
+  MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf\r
 \r
 [Components.IA32]\r
   MdePkg/Library/BaseMemoryLibSse2/BaseMemoryLibSse2.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 70bed1618d9a8487b1bff535012481142ed89a2d..08a624fba548a0e3511e07322fa843ab72f38833 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -67,7 +67,6 @@
   HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf\r
   S3Lib|MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf\r
   RecoveryLib|MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf\r
-  ExtractGuidedSectionLib|MdePkg/Library/PeiDxeExtractGuidedSectionLib/PeiDxeExtractGuidedSectionLib.inf\r
   \r
 [LibraryClasses.common.BASE]\r
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
@@ -95,6 +94,7 @@
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   PeCoffLib|Nt32Pkg/Library/DxeNT32PeCoffLib/DxeNT32PeCoffLib.inf\r
+  ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf\r
 \r
 [LibraryClasses.common.DXE_SMM_DRIVER]\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
@@ -128,6 +128,7 @@
   DebugLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf\r
   PeCoffLib|Nt32Pkg/Library/PeiNT32PeCoffLib/PeiNT32PeCoffLib.inf\r
   PeiPiLib|MdePkg/Library/PeiPiLib/PeiPiLib.inf\r
+  ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf\r
   \r
 [LibraryClasses.common.PEI_CORE]\r
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf\r