Merge branch of PI tree to main trunk

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

1 files changed, 1 insertions, 15 deletions

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index c7b4cc3e12..da0555d8f9 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -490,7 +490,6 @@ Returns:
       

       CoreReleaseDispatcherLock ();

 

-

       CoreReportProgressCodeSpecific (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_BEGIN, DriverEntry->ImageHandle);

       Status = CoreStartImage (DriverEntry->ImageHandle, NULL, NULL);

       CoreReportProgressCodeSpecific (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_END, DriverEntry->ImageHandle);

@@ -814,25 +813,12 @@ Returns:
 --*/

 {

   EFI_PEI_HOB_POINTERS                HobFv2;

-  EFI_STATUS                          Status;

-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *Fvb;

-  EFI_FIRMWARE_VOLUME_HEADER          *FvHeader;

-  EFI_PHYSICAL_ADDRESS                FvHeaderAddr;

   

   HobFv2.Raw = GetHobList ();

   

   while ((HobFv2.Raw = GetNextHob (EFI_HOB_TYPE_FV2, HobFv2.Raw)) != NULL) {

     if (CompareGuid (DriverName, &HobFv2.FirmwareVolume2->FileName)) {

-      Status = CoreHandleProtocol (FvHandle, &gEfiFirmwareVolumeBlockProtocolGuid, (VOID **) &Fvb);

-      if (!EFI_ERROR (Status)) {

-        Status = Fvb->GetPhysicalAddress (Fvb, &FvHeaderAddr);

-        if (!EFI_ERROR (Status)) {

-          FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvHeaderAddr;

-          if (CompareGuid (&FvHeader->FileSystemGuid, &HobFv2.FirmwareVolume2->FvName)) {

-            return TRUE;

-          }

-        }

-      }

+      return TRUE;

     }

     HobFv2.Raw = GET_NEXT_HOB (HobFv2);

   }