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

BaseTools: refactor to remove duplicate functions 

Update GenFdsGlobalVariable GetAlignment to support G.
replace use of local function in Region with updated shared function.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob C Feng <bob.c.feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben 2018-09-06 05:50:46 +08:00 committed by Yonghong Zhu
parent b48ec0e8ab
commit 7bf1eb6ef8
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
View File

@ -512,14 +512,15 @@ class GenFdsGlobalVariable:
@staticmethod @staticmethod
def GetAlignment (AlignString): def GetAlignment (AlignString):
if AlignString is None: if not AlignString:
return 0 return 0
if AlignString in ("1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K", "512K"): if AlignString.endswith('K'):
return int (AlignString.rstrip('K')) * 1024 return int (AlignString.rstrip('K')) * 1024
elif AlignString in ("1M", "2M", "4M", "8M", "16M"): if AlignString.endswith('M'):
return int (AlignString.rstrip('M')) * 1024 * 1024 return int (AlignString.rstrip('M')) * 1024 * 1024
else: if AlignString.endswith('G'):
return int (AlignString) return int (AlignString.rstrip('G')) * 1024 * 1024 * 1024
return int (AlignString)
@staticmethod @staticmethod
def GenerateFfs(Output, Input, Type, Guid, Fixed=False, CheckSum=False, Align=None, def GenerateFfs(Output, Input, Type, Guid, Fixed=False, CheckSum=False, Align=None,

21
BaseTools/Source/Python/GenFds/Region.py
View File

@ -124,7 +124,7 @@ class Region(RegionClassObject):
# #
self.BlockInfoOfRegion(BlockSizeList, FvObj) self.BlockInfoOfRegion(BlockSizeList, FvObj)
self.FvAddress = self.FvAddress + FvOffset self.FvAddress = self.FvAddress + FvOffset
FvAlignValue = self.GetFvAlignValue(FvObj.FvAlignment) FvAlignValue = GenFdsGlobalVariable.GetAlignment(FvObj.FvAlignment)
if self.FvAddress % FvAlignValue != 0: if self.FvAddress % FvAlignValue != 0:
EdkLogger.error("GenFds", GENFDS_ERROR, EdkLogger.error("GenFds", GENFDS_ERROR,
"FV (%s) is NOT %s Aligned!" % (FvObj.UiFvName, FvObj.FvAlignment)) "FV (%s) is NOT %s Aligned!" % (FvObj.UiFvName, FvObj.FvAlignment))
@ -277,25 +277,6 @@ class Region(RegionClassObject):
GenFdsGlobalVariable.InfLogger(' Region Name = None') GenFdsGlobalVariable.InfLogger(' Region Name = None')
self.PadBuffer(Buffer, ErasePolarity, Size) self.PadBuffer(Buffer, ErasePolarity, Size)
def GetFvAlignValue(self, Str):
AlignValue = 1
Granu = 1
Str = Str.strip().upper()
if Str.endswith('K'):
Granu = 1024
Str = Str[:-1]
elif Str.endswith('M'):
Granu = 1024 * 1024
Str = Str[:-1]
elif Str.endswith('G'):
Granu = 1024 * 1024 * 1024
Str = Str[:-1]
else:
pass
AlignValue = int(Str) * Granu
return AlignValue
## BlockSizeOfRegion() ## BlockSizeOfRegion()
# #
# @param BlockSizeList List of block information # @param BlockSizeList List of block information