EfiLdr: Consumed UefiImageLib.

acidanthera · Oct 23, 2023 · ee72ccd · ee72ccd
1 parent c94f21e
commit ee72ccd
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 583 deletions.
diff --git a/Legacy/BootPlatform/EfiLdr/EfiLdr.h b/Legacy/BootPlatform/EfiLdr/EfiLdr.h
@@ -25,7 +25,7 @@ Revision History:
 #include "EfiLdrHandoff.h"
 
 #include <Protocol/LoadedImage.h>
-#include <IndustryStandard/PeImage.h>
+#include <IndustryStandard/PeImage2.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PrintLib.h>
@@ -86,4 +86,13 @@ VOID
   IN EFILDRHANDOFF  *Handoff
   );
 
+EFI_STATUS
+EfiLdrLoadImage (
+  IN VOID                   *FHand,
+  IN UINT32                 BufferSize,
+  IN EFILDR_LOADED_IMAGE    *Image,
+  IN UINTN                  *NumberOfMemoryMapEntries,
+  IN EFI_MEMORY_DESCRIPTOR  *EfiMemoryDescriptor
+  );
+
 #endif //_DUET_EFI_LOADER_H_
diff --git a/Legacy/BootPlatform/EfiLdr/EfiLdr.inf b/Legacy/BootPlatform/EfiLdr/EfiLdr.inf
@@ -35,9 +35,9 @@
   PrintLib
   LzmaDecompressLib
   SerialPortLib
+  UefiImageOnlyFvLib
 
 [Sources]
-  PeLoader.h
   Support.h
   EfiLdrHandoff.h
   EfiLdr.h

diff --git a/Legacy/BootPlatform/EfiLdr/EfiLoader.c b/Legacy/BootPlatform/EfiLdr/EfiLoader.c
@@ -20,7 +20,6 @@ Revision History:
 
 #include "EfiLdr.h"
 #include "Support.h"
-#include "PeLoader.h"
 #include "LzmaDecompress.h"
 
 #include <Library/SerialPortLib.h>
@@ -142,8 +141,9 @@ EfiLoader (
   //
   // Load and relocate the EFI PE/COFF Firmware Image
   //
-  Status = EfiLdrPeCoffLoadPeImage (
+  Status = EfiLdrLoadImage (
              (VOID *)(UINTN)(EFI_DECOMPRESSED_BUFFER_ADDRESS),
+             DestinationSize,
              &DxeIplImage,
              &NumberOfMemoryMapEntries,
              EfiMemoryDescriptor
@@ -184,8 +184,9 @@ EfiLoader (
   //
   // Load and relocate the EFI PE/COFF Firmware Image
   //
-  Status = EfiLdrPeCoffLoadPeImage (
+  Status = EfiLdrLoadImage (
              (VOID *)(UINTN)(EFI_DECOMPRESSED_BUFFER_ADDRESS),
+             DestinationSize,
              &DxeCoreImage,
              &NumberOfMemoryMapEntries,
              EfiMemoryDescriptor