UefiPayloadPkg: Align relocation item with spec

Currently, FIT Payload data relocation data has some minor error with Universal Payload Specification v0.9.1 section 2.4.3. Signed-off-by: Gua Guo <[email protected]>
tianocore · Sep 23, 2024 · 14bfcc4 · 14bfcc4
1 parent 222e285
commit 14bfcc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/UefiPayloadPkg/PayloadLoaderPeim/FitLib.h b/UefiPayloadPkg/PayloadLoaderPeim/FitLib.h
@@ -12,8 +12,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/FdtLib.h>
 
 typedef struct {
-  UINT64    RelocateType;
   UINT64    Offset;
+  UINT64    RelocateType;
 } FIT_RELOCATE_ITEM;
 
 typedef struct {

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -269,7 +269,7 @@ def BuildUniversalPayload(Args):
                     continue
                 Type = entry.type
                 Offset = entry.rva + fit_image_info_header.DataOffset
-                RelocBinary += Type.to_bytes (8, 'little') + Offset.to_bytes (8, 'little')
+                RelocBinary += Offset.to_bytes (8, 'little') + Type.to_bytes (8, 'little')
         RelocBinary += b'\x00' * (0x1000 - (len(RelocBinary) % 0x1000))
 
         #