summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsey, Jaben <jaben.carsey@intel.com>2018-10-24 01:29:21 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2018-10-25 20:15:32 +0800
commit9ffaaac2e5e7c5e21ad4ff2d0f9ac5d84878e57d (patch)
treeae7e6d7e7c45153d547917d98fd1de8032fac611
parent5a264f28ee01e58f1dee19efd7a590942cf2fb21 (diff)
downloadedk2-9ffaaac2e5e7c5e21ad4ff2d0f9ac5d84878e57d.tar.gz
edk2-9ffaaac2e5e7c5e21ad4ff2d0f9ac5d84878e57d.tar.xz
edk2-9ffaaac2e5e7c5e21ad4ff2d0f9ac5d84878e57d.zip
Basetools/GenFds: refactor class FV
1) initialize UiFvName via __init__ parameter. No change to default behavior. 2) initialize 3 empty lists in __init__. Curently not guarenteed initialized. Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@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>
-rw-r--r--BaseTools/Source/Python/GenFds/FdfParser.py6
-rw-r--r--BaseTools/Source/Python/GenFds/Fv.py9
2 files changed, 6 insertions, 9 deletions
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 8b4d5e7fd8..9e806de0d2 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -2090,8 +2090,7 @@ class FdfParser:
if not self._IsToken(TAB_SECTION_END):
raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)
- FvObj = FV()
- FvObj.UiFvName = self.CurrentFvName
+ FvObj = FV(Name=self.CurrentFvName)
self.Profile.FvDict[self.CurrentFvName] = FvObj
Status = self._GetCreateFile(FvObj)
@@ -2102,9 +2101,6 @@ class FdfParser:
self._GetAddressStatements(FvObj)
- FvObj.FvExtEntryTypeValue = []
- FvObj.FvExtEntryType = []
- FvObj.FvExtEntryData = []
while True:
self._GetSetStatements(FvObj)
diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 30525bd11f..d89e7bfbdd 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -37,8 +37,8 @@ class FV (object):
#
# @param self The object pointer
#
- def __init__(self):
- self.UiFvName = None
+ def __init__(self, Name=None):
+ self.UiFvName = Name
self.CreateFileName = None
self.BlockSizeList = []
self.DefineVarDict = {}
@@ -61,7 +61,9 @@ class FV (object):
self.FvForceRebase = None
self.FvRegionInFD = None
self.UsedSizeEnable = False
-
+ self.FvExtEntryTypeValue = []
+ self.FvExtEntryType = []
+ self.FvExtEntryData = []
## AddToBuffer()
#
# Generate Fv and add it to the Buffer
@@ -77,7 +79,6 @@ class FV (object):
# @retval string Generated FV file path
#
def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False):
-
if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFdsGlobalVariable.ImageBinDict:
return GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv']