tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: fixing FMMT ShrinkFv issue 

1. FvLength not change issue;
2. FileSystemGuid align with File Size;

Cc: Rebecca Cran <rebecca@bsdio.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Yuwei Chen 2023-06-29 11:34:20 +08:00 committed by mergify[bot]
parent 59f0d350a9
commit 5b5481526f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/Python/FMMT/core/FMMTOperation.py
View File

@ -188,7 +188,7 @@ def ExtractFfs(inputfile: str, Ffs_name: str, outputfile: str, Fv_name: str=None
FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findlist[index]) FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findlist[index])
if FmmtParser.WholeFvTree.Findlist != []: if FmmtParser.WholeFvTree.Findlist != []:
TargetNode = FmmtParser.WholeFvTree.Findlist[0] TargetNode = FmmtParser.WholeFvTree.Findlist[0]
if TargetNode.type == FV_TREE or SEC_FV_TREE or DATA_FV_TREE: if TargetNode.type == FV_TREE or TargetNode.type == SEC_FV_TREE or TargetNode.type == DATA_FV_TREE:
FinalData = struct2stream(TargetNode.Data.Header) + TargetNode.Data.Data FinalData = struct2stream(TargetNode.Data.Header) + TargetNode.Data.Data
with open(outputfile, "wb") as f: with open(outputfile, "wb") as f:
f.write(FinalData) f.write(FinalData)

10
BaseTools/Source/Python/FMMT/core/FvHandler.py
View File

@ -279,7 +279,7 @@ class FvHandler:
ParTree.Child.remove(ParTree.Child[-1]) ParTree.Child.remove(ParTree.Child[-1])
ParTree.Data.Free_Space = 0 ParTree.Data.Free_Space = 0
ParTree.Data.Size += Needed_Space ParTree.Data.Size += Needed_Space
ParTree.Data.Header.Fvlength = ParTree.Data.Size ParTree.Data.Header.FvLength = ParTree.Data.Size
ModifyFvSystemGuid(ParTree) ModifyFvSystemGuid(ParTree)
for item in ParTree.Child: for item in ParTree.Child:
if item.type == FFS_FREE_SPACE: if item.type == FFS_FREE_SPACE:
@ -663,8 +663,12 @@ class FvHandler:
Removed_Space = TargetFv.Data.Free_Space - New_Free_Space Removed_Space = TargetFv.Data.Free_Space - New_Free_Space
TargetFv.Child[-1].Data.Data = b'\xff' * New_Free_Space TargetFv.Child[-1].Data.Data = b'\xff' * New_Free_Space
TargetFv.Data.Size -= Removed_Space TargetFv.Data.Size -= Removed_Space
TargetFv.Data.Header.Fvlength = TargetFv.Data.Size TargetFv.Data.Header.FvLength = TargetFv.Data.Size
ModifyFvSystemGuid(TargetFv) if struct2stream(TargetFv.Data.Header.FileSystemGuid) == EFI_FIRMWARE_FILE_SYSTEM3_GUID_BYTE:
if TargetFv.Data.Size <= 0xFFFFFF:
TargetFv.Data.Header.FileSystemGuid = ModifyGuidFormat(
"8c8ce578-8a3d-4f1c-9935-896185c32dd3")
for item in TargetFv.Child: for item in TargetFv.Child:
if item.type == FFS_FREE_SPACE: if item.type == FFS_FREE_SPACE:
TargetFv.Data.Data += item.Data.Data + item.Data.PadData TargetFv.Data.Data += item.Data.Data + item.Data.PadData