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

BaseTools: Dsc/Fdf conditional statement parse issue

Browse Source 
Set PCD value with --pcd argument not replace DSC/Fdf PCD value.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Feng, YunhuaX
2018-03-01 20:42:01 +08:00
committed by Yonghong Zhu
parent 8805bd904a
commit 1fa7fdf6ea
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,6 +925,10 @@ class FdfParser:
MacroDict.update(GlobalData.gGlobalDefines) MacroDict.update(GlobalData.gGlobalDefines)
MacroDict.update(GlobalData.gCommandLineDefines) MacroDict.update(GlobalData.gCommandLineDefines)
if GlobalData.BuildOptionPcd:
for Item in GlobalData.BuildOptionPcd:
PcdName, TmpValue = Item.split("=")
MacroDict[PcdName.strip()] = TmpValue
# Highest priority # Highest priority
return MacroDict return MacroDict

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

@ -1243,6 +1243,10 @@ class DscParser(MetaFileParser):
# PCD cannot be referenced in macro definition # PCD cannot be referenced in macro definition
if self._ItemType not in [MODEL_META_DATA_DEFINE, MODEL_META_DATA_GLOBAL_DEFINE]: if self._ItemType not in [MODEL_META_DATA_DEFINE, MODEL_META_DATA_GLOBAL_DEFINE]:
Macros.update(self._Symbols) Macros.update(self._Symbols)
if GlobalData.BuildOptionPcd:
for Item in GlobalData.BuildOptionPcd:
PcdName, TmpValue = Item.split("=")
Macros[PcdName.strip()] = TmpValue
return Macros return Macros
def _PostProcess(self): def _PostProcess(self):