summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNate DeSimone <nathaniel.l.desimone@intel.com>2021-02-05 23:54:23 +0300
committerNate DeSimone <nathaniel.l.desimone@intel.com>2021-02-05 23:57:10 +0300
commit2a0c3760ccfdbd7a5f362f5b84e6b7387f75ec92 (patch)
tree17cfe6aa426643e9856b39384f9bb0d7bfc1a813
parent56162467c6fd7aaaac3713fc6b5c715ae27b1bc1 (diff)
downloadFSP-legacy.tar.xz
Update SplitFspBin.py to latest from edk2legacy
Updated to d448574
-rw-r--r--Tools/SplitFspBin.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/SplitFspBin.py b/Tools/SplitFspBin.py
index 3c0d5af..24272e8 100644
--- a/Tools/SplitFspBin.py
+++ b/Tools/SplitFspBin.py
@@ -677,8 +677,12 @@ class PeTeImage:
else:
offset = self.Offset + self.DosHdr.e_lfanew
offset += EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset
- offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset
- size = EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size
+ if self.PeHdr.OptionalHeader.PePlusOptHdr.Magic == 0x20b: # PE32+ image
+ offset += EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset
+ size = EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size
+ else:
+ offset += EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset
+ size = EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size
value = Bytes2Val(fdbin[offset:offset+size]) + delta
fdbin[offset:offset+size] = Val2Bytes(value, size)