Print real entry point for IPF image.

[mirror_edk2.git] / MdeModulePkg / Core / Pei / FwVol / FwVol.c

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 34fe0a1d9e3262ada45814a11d725b0c1cc6f194..e649223ef1c6337c971be130d09b77325a2c5281 100644 (file)
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -224,10 +224,10 @@ Returns:
     FileOccupiedSize = GET_OCCUPIED_SIZE (FileLength, 8);\r
     FfsFileHeader = (EFI_FFS_FILE_HEADER *)((UINT8 *)*FileHeader + FileOccupiedSize);\r
   }\r
-\r
+  \r
   FileOffset = (UINT32) ((UINT8 *)FfsFileHeader - (UINT8 *)FwVolHeader);\r
   ASSERT (FileOffset <= 0xFFFFFFFF);\r
-  \r
+\r
   while (FileOffset < (FvLength - sizeof (EFI_FFS_FILE_HEADER))) {\r
     //\r
     // Get FileState which is the highest bit of the State \r
@@ -244,6 +244,7 @@ Returns:
     case EFI_FILE_MARKED_FOR_UPDATE:\r
       if (CalculateHeaderChecksum (FfsFileHeader) != 0) {\r
         ASSERT (FALSE);\r
+        *FileHeader = NULL;\r
         return EFI_NOT_FOUND;\r
       }\r
 \r
@@ -285,11 +286,12 @@ Returns:
       break;\r
 \r
     default:\r
+      *FileHeader = NULL;\r
       return EFI_NOT_FOUND;\r
-\r
     } \r
   }\r
-\r
+  \r
+  *FileHeader = NULL;\r
   return EFI_NOT_FOUND;  \r
 }\r
 \r
@@ -366,7 +368,7 @@ Returns:
   \r
   PrivateData = PEI_CORE_INSTANCE_FROM_PS_THIS (PeiServices);\r
 \r
-  if (PrivateData->FvCount >= PEI_CORE_MAX_FV_SUPPORTED) {\r
+  if (PrivateData->FvCount >= FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {\r
     ASSERT (FALSE);\r
   }\r
 \r
@@ -379,7 +381,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