0) Change the PEI core behavior to not install FV HOB for each FV INFO PPI installed...

1) Split MdePkg/Include/Library/PiLib.h to DxePiLib.h and PeiPiLib.h. These two library classes are for DXE phase and PEI phase.
2) Update the API names in DxePiLib and PeiPiLib to be longer ones to be more meaningfull and to avoid name collisions.

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

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 32474cb441c10f501c121ae43f60ceb96dd099df..82382111e6010b7ee45471dfcac4d87a5f048c3a 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -345,12 +345,21 @@ DxeIplAddEncapsulatedFirmwareVolumes (
           //\r
           PeiServicesFfsGetVolumeInfo (&VolumeHandle, &VolumeInfo);\r
 \r
-          PeiPiLibBuildPiFvInfoPpi (\r
-            (EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,\r
-            FvHeader->FvLength,\r
+          PiLibInstallFvInfoPpi (\r
+            NULL,\r
+            FvHeader,\r
+            (UINT32) FvHeader->FvLength,\r
             &(VolumeInfo.FvName),\r
             &(((EFI_FFS_FILE_HEADER*)FileHandle)->Name)\r
             );\r
+\r
+          //\r
+          // Inform HOB consumer phase, i.e. DXE core, the existance of this FV\r
+          //\r
+          BuildFvHob (\r
+            (EFI_PHYSICAL_ADDRESS) (UINTN) FvHeader,\r
+            FvHeader->FvLength\r
+          );\r
             \r
           ASSERT_EFI_ERROR (Status);\r
 \r

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 34fe0a1d9e3262ada45814a11d725b0c1cc6f194..cd1de1b41bbbbbfa0ca2a6fb144abfffb43f7c4e 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -379,7 +379,6 @@ Returns:
        }\r
      }\r
     PrivateData->Fv[PrivateData->FvCount++].FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Fv->FvInfo;\r
-    BuildFvHob ((EFI_PHYSICAL_ADDRESS) (UINTN) Fv->FvInfo, (UINT64) Fv->FvInfoSize);\r
   }\r
 \r
   //\r