sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate

Browse Source 
Move the GlobalData.BuildOptionPcd before FdfParser() function and add
type check for Pcd item.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yonghong Zhu
2018-03-09 15:18:35 +08:00
parent 8565b5829c
commit 705ed563de
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/Python/GenFds/FdfParser.py
View File

@ -927,6 +927,8 @@ class FdfParser:
MacroDict.update(GlobalData.gCommandLineDefines) MacroDict.update(GlobalData.gCommandLineDefines)
if GlobalData.BuildOptionPcd: if GlobalData.BuildOptionPcd:
for Item in GlobalData.BuildOptionPcd: for Item in GlobalData.BuildOptionPcd:
if type(Item) is tuple:
continue
PcdName, TmpValue = Item.split("=") PcdName, TmpValue = Item.split("=")
TmpValue = BuildOptionValue(TmpValue, {}) TmpValue = BuildOptionValue(TmpValue, {})
MacroDict[PcdName.strip()] = TmpValue MacroDict[PcdName.strip()] = TmpValue

2
BaseTools/Source/Python/GenFds/GenFds.py
View File

@ -142,6 +142,7 @@ def main():
else: else:
EdkLogger.error("GenFds", OPTION_MISSING, "Missing active platform") EdkLogger.error("GenFds", OPTION_MISSING, "Missing active platform")
GlobalData.BuildOptionPcd = Options.OptionPcd if Options.OptionPcd else {}
GenFdsGlobalVariable.ActivePlatform = PathClass(NormPath(ActivePlatform)) GenFdsGlobalVariable.ActivePlatform = PathClass(NormPath(ActivePlatform))
if (Options.ConfDirectory): if (Options.ConfDirectory):
@ -326,7 +327,6 @@ def main():
FvObj.FvRegionInFD = RegionObj.Size FvObj.FvRegionInFD = RegionObj.Size
RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, FvObj) RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, FvObj)
GlobalData.BuildOptionPcd = Options.OptionPcd if Options.OptionPcd else {}
"""Call GenFds""" """Call GenFds"""
GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList) GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList)

2
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -1245,6 +1245,8 @@ class DscParser(MetaFileParser):
Macros.update(self._Symbols) Macros.update(self._Symbols)
if GlobalData.BuildOptionPcd: if GlobalData.BuildOptionPcd:
for Item in GlobalData.BuildOptionPcd: for Item in GlobalData.BuildOptionPcd:
if type(Item) is tuple:
continue
PcdName, TmpValue = Item.split("=") PcdName, TmpValue = Item.split("=")
TmpValue = BuildOptionValue(TmpValue, self._GuidDict) TmpValue = BuildOptionValue(TmpValue, self._GuidDict)
Macros[PcdName.strip()] = TmpValue Macros[PcdName.strip()] = TmpValue