From 11f28961dabd0a60e61e4d81a9716c4a05068dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?=
 <8659494+mhaeuser@users.noreply.github.com>
Date: Sun, 2 Apr 2023 17:19:14 +0200
Subject: [PATCH] UefiPayloadPkg/UefiPayloadEntry: Return image destination
 size as UINT32

---
 UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c b/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c
index d8e8862fb5..7d635b9bf3 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c
@@ -24,7 +24,7 @@ LoadUefiImage (
   IN  VOID                  *UefiImage,
   IN  UINT32                UefiImageSize,
   OUT EFI_PHYSICAL_ADDRESS  *ImageAddress,
-  OUT UINT64                *DestinationSize,
+  OUT UINT32                *DestinationSize,
   OUT EFI_PHYSICAL_ADDRESS  *EntryPoint
   )
 {
@@ -234,7 +234,7 @@ LoadDxeCore (
   VOID                        *UefiImage;
   UINT32                      UefiImageSize;
   EFI_PHYSICAL_ADDRESS        ImageAddress;
-  UINT64                      DestinationSize;
+  UINT32                      DestinationSize;
 
   PayloadFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)PcdGet32 (PcdPayloadFdMemBase);
 
@@ -299,10 +299,10 @@ UniversalLoadDxeCore (
 {
   EFI_STATUS            Status;
   EFI_FFS_FILE_HEADER   *FileHeader;
-  VOID                        *UefiImage;
-  UINT32                      UefiImageSize;
+  VOID                  *UefiImage;
+  UINT32                UefiImageSize;
   EFI_PHYSICAL_ADDRESS  ImageAddress;
-  UINT64                ImageSize;
+  UINT32                DestinationSize;
 
   //
   // Find DXE core file from DXE FV
@@ -320,12 +320,12 @@ UniversalLoadDxeCore (
   //
   // Get DXE core info
   //
-  Status = LoadUefiImage (UefiImage, UefiImageSize, &ImageAddress, &ImageSize, DxeCoreEntryPoint);
+  Status = LoadUefiImage (UefiImage, UefiImageSize, &ImageAddress, &DestinationSize, DxeCoreEntryPoint);
   if (EFI_ERROR (Status)) {
     return Status;
   }
 
-  BuildModuleHob (&FileHeader->Name, ImageAddress, EFI_SIZE_TO_PAGES ((UINT32)ImageSize) * EFI_PAGE_SIZE, *DxeCoreEntryPoint);
+  BuildModuleHob (&FileHeader->Name, ImageAddress, DestinationSize, *DxeCoreEntryPoint);
 
   return EFI_SUCCESS;
 }