#\r
def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False) :\r
\r
- if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.ImageBinDict.keys():\r
+ if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFds.ImageBinDict:\r
return GenFds.ImageBinDict[self.UiFvName.upper() + 'fv']\r
\r
#\r
# If yes, return error. Doesn't support FV in Capsule image is also in FD flash region.\r
#\r
if self.CapsuleName is not None:\r
- for FdName in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
- FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[FdName]\r
+ for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r
for RegionObj in FdObj.RegionList:\r
if RegionObj.RegionType == 'FV':\r
for RegionData in RegionObj.RegionDataList:\r
if RegionData.endswith(".fv"):\r
continue\r
- elif RegionData.upper() + 'fv' in GenFds.ImageBinDict.keys():\r
+ elif RegionData.upper() + 'fv' in GenFds.ImageBinDict:\r
continue\r
elif self.UiFvName.upper() == RegionData.upper():\r
GenFdsGlobalVariable.ErrorLogger("Capsule %s in FD region can't contain a FV %s in FD region." % (self.CapsuleName, self.UiFvName.upper()))\r
if self.BlockSizeList:\r
return True\r
\r
- for FdName in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
- FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[FdName]\r
+ for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r
for RegionObj in FdObj.RegionList:\r
if RegionObj.RegionType != 'FV':\r
continue\r
' %s' %ErasePloarity + \\r
T_CHAR_LF)\r
if not (self.FvAttributeDict is None):\r
- for FvAttribute in self.FvAttributeDict:\r
+ for FvAttribute in self.FvAttributeDict.keys() :\r
if FvAttribute == "FvUsedSizeEnable":\r
if self.FvAttributeDict[FvAttribute].upper() in ('TRUE', '1') :\r
self.UsedSizeEnable = True\r
# Add [Files]\r
#\r
self.FvInfFile.writelines("[files]" + T_CHAR_LF)\r
- if VtfDict is not None and self.UiFvName in VtfDict.keys():\r
+ if VtfDict and self.UiFvName in VtfDict:\r
self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r
- VtfDict.get(self.UiFvName) + \\r
+ VtfDict[self.UiFvName] + \\r
T_CHAR_LF)\r