EfiLdr: Made boot loader support only UE format.

acidanthera · Oct 30, 2023 · fa683a6 · fa683a6
1 parent 2eafb70
commit fa683a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/Legacy/BootPlatform/EfiLdr/EfiLdr.inf b/Legacy/BootPlatform/EfiLdr/EfiLdr.inf
@@ -35,7 +35,7 @@
   PrintLib
   LzmaDecompressLib
   SerialPortLib
-  UefiImageOnlyFvLib
+  UefiImageOnlyNonFvLib
 
 [Sources]
   Support.h

diff --git a/Legacy/BootPlatform/EfiLdr/EfiLoader.c b/Legacy/BootPlatform/EfiLdr/EfiLoader.c
@@ -22,8 +22,6 @@ Revision History:
 #include "Support.h"
 #include "LzmaDecompress.h"
 
-#include <Library/SerialPortLib.h>
-
 EFILDR_LOADED_IMAGE  DxeCoreImage;
 EFILDR_LOADED_IMAGE  DxeIplImage;
 
@@ -84,7 +82,6 @@ EfiLoader (
              &DestinationSize,
              &ScratchSize
              );
-
   if (EFI_ERROR (Status)) {
     SystemHang ("Failed to get decompress information for BFV!\n");
   }
@@ -95,7 +92,6 @@ EfiLoader (
               (VOID *)(UINTN)EFI_DECOMPRESSED_BUFFER_ADDRESS,
               (VOID *)(UINTN)((EFI_DECOMPRESSED_BUFFER_ADDRESS + DestinationSize + 0x1000) & 0xfffff000)
               );
-
   if (EFI_ERROR (Status)) {
     SystemHang ("Failed to decompress BFV!\n");
   }
@@ -161,7 +157,6 @@ EfiLoader (
   // Decompress the image
   //
   Status = LzmaUefiDecompressGetInfo (
-
              (VOID *)(UINTN)(EFILDR_HEADER_ADDRESS + EFILDRImage->Offset),
              EFILDRImage->Length,
              &DestinationSize,

diff --git a/Legacy/BootPlatform/EfiLdr/PeLoader.c b/Legacy/BootPlatform/EfiLdr/PeLoader.c
@@ -40,7 +40,7 @@ EfiLdrLoadImage (
              &ImageContext,
              FHand,
              BufferSize,
-             UEFI_IMAGE_SOURCE_FV
+             UEFI_IMAGE_SOURCE_NON_FV
              );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -71,7 +71,7 @@ EfiLdrLoadImage (
       return EFI_INVALID_PARAMETER;
   }
 
-  Image->NoPages = EFI_SIZE_TO_PAGES (BufferSize);
+  Image->NoPages = EFI_SIZE_TO_PAGES (UefiImageGetImageSize (&ImageContext));
 
   //
   // Compute the amount of memory needed to load the image and

diff --git a/build_duet.tool b/build_duet.tool
@@ -25,13 +25,15 @@ imgbuild() {
   LzmaCompress -e -o "${BUILD_DIR}/FV/DUETEFIMAINFVBLOCKIO${arch}.z" \
     "${BUILD_DIR}/FV/DUETEFIMAINFVBLOCKIO${arch}.Fv" || exit 1
 
-  echo "Compressing DxeCore.efi..."
+  echo "Compressing DxeCoreUe.raw..."
+  ImageTool GenImage -c UE -o "${BUILD_DIR_ARCH}/DxeCoreUe.raw" "${BUILD_DIR_ARCH}/DxeCore.efi"
   LzmaCompress -e -o "${BUILD_DIR}/FV/DxeMain${arch}.z" \
-    "${BUILD_DIR_ARCH}/DxeCore.efi" || exit 1
+    "${BUILD_DIR_ARCH}/DxeCoreUe.raw" || exit 1
 
-  echo "Compressing DxeIpl.efi..."
+  echo "Compressing DxeIplUe.raw..."
+  ImageTool GenImage -c UE -o "${BUILD_DIR_ARCH}/DxeIplUe.raw" "${BUILD_DIR_ARCH}/DxeIpl.efi"
   LzmaCompress -e -o "${BUILD_DIR}/FV/DxeIpl${arch}.z" \
-    "$BUILD_DIR_ARCH/DxeIpl.efi" || exit 1
+    "${BUILD_DIR_ARCH}/DxeIplUe.raw" || exit 1
 
   echo "Generating Loader Image..."