Set Hob type for FvMainCompactFv to EFI_HOB_TYPE_UNUSED after decompressed. The can...

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

diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h b/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h
index 13b1a69baea0b29bb6681be21a71837f00f49c83..53ee7e2d94203bd403c6134ebdb5ad2c029d6239 100644 (file)
--- a/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h
+++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h
@@ -104,7 +104,8 @@ EFI_STATUS
 PeiProcessFile (\r
   IN      UINT16                 SectionType,\r
   IN OUT  EFI_FFS_FILE_HEADER    **RealFfsFileHeader,\r
-  OUT     VOID                   **Pe32Data\r
+  OUT     VOID                   **Pe32Data,\r
+  IN      EFI_PEI_HOB_POINTERS   *OrigHob\r
   );\r
 \r
 EFI_STATUS\r

diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
index d01daafbe2deace2d88a7e154f2b06f6f6d81b1a..33ca3bbb04ff4f5981dfbf09139c4958c4054c8f 100644 (file)
--- a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
+++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
@@ -435,7 +435,8 @@ Returns:
       Status = PeiProcessFile (\r
                  SectionType,\r
                  &FfsFileHeader,\r
-                 Pe32Data\r
+                 Pe32Data,\r
+                 &Hob\r
                  );\r
       CopyMem (FileName, &FfsFileHeader->Name, sizeof (EFI_GUID));\r
       return Status;\r
@@ -650,7 +651,8 @@ Returns:
   Status = PeiProcessFile (\r
             EFI_SECTION_PE32,\r
             &FfsHeader,\r
-            &Pe32Data\r
+            &Pe32Data,\r
+            NULL\r
             );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -675,7 +677,8 @@ EFI_STATUS
 PeiProcessFile (\r
   IN      UINT16                 SectionType,\r
   IN OUT  EFI_FFS_FILE_HEADER    **RealFfsFileHeader,\r
-  OUT     VOID                   **Pe32Data\r
+  OUT     VOID                   **Pe32Data,\r
+  IN      EFI_PEI_HOB_POINTERS   *OrigHob\r
   )\r
 /*++\r
 \r
@@ -930,11 +933,17 @@ Returns:
               return EFI_NOT_FOUND;\r
             }\r
 \r
+            if (OrigHob != NULL) {\r
+              //\r
+              // \r
+              OrigHob->Header->HobType = EFI_HOB_TYPE_UNUSED;\r
+            }\r
+            \r
             //\r
             // Reture the FfsHeader that contain Pe32Data.\r
             //\r
             *RealFfsFileHeader = FfsFileHeader;\r
-            return PeiProcessFile (SectionType, RealFfsFileHeader, Pe32Data);\r
+            return PeiProcessFile (SectionType, RealFfsFileHeader, Pe32Data, OrigHob);\r
           }\r
         }\r
         //\r