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

BaseTools: Fixed build Ovmfpkg failed issue. 

Fixed the regression issues caused by 543f5ac30f

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
BobCF 2018-07-16 17:38:44 +08:00 committed by Liming Gao
parent 2add3cffb0
commit 4c6d0de7ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Source/Python/Workspace/DscBuildData.py
View File

@ -1295,10 +1295,10 @@ class DscBuildData(PlatformBuildClassObject):
if GlobalData.gFdfParser is None: if GlobalData.gFdfParser is None:
return AllPcds return AllPcds
NoFiledValues = GlobalData.gFdfParser.Profile.PcdDict NoFiledValues = GlobalData.gFdfParser.Profile.PcdDict
for Guid,Name,Field in NoFiledValues: for Name,Guid,Field in NoFiledValues:
if len(Field): if len(Field):
continue continue
Value = NoFiledValues[(Guid,Name,Field)] Value = NoFiledValues[(Name,Guid,Field)]
if (Name,Guid) in AllPcds: if (Name,Guid) in AllPcds:
Pcd = AllPcds.get((Name,Guid)) Pcd = AllPcds.get((Name,Guid))
if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), None),StructurePcd): if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), None),StructurePcd):
@ -1325,7 +1325,7 @@ class DscBuildData(PlatformBuildClassObject):
else: else:
PcdInDec = self.DecPcds.get((Name,Guid)) PcdInDec = self.DecPcds.get((Name,Guid))
if PcdInDec: if PcdInDec:
PcdInDec.PcdValueFromComm = Value PcdInDec.PcdValueFromFdf = Value
if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE], self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],
self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]: self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]: