From 4c6d0de7bad46fc15fd34d394dffda3766e3a6a1 Mon Sep 17 00:00:00 2001 From: BobCF Date: Mon, 16 Jul 2018 17:38:44 +0800 Subject: [PATCH] BaseTools: Fixed build Ovmfpkg failed issue. Fixed the regression issues caused by 543f5ac30facfbb40eafb2b4908649a427784080 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bob Feng Cc: Liming Gao Reviewed-by: Liming Gao --- BaseTools/Source/Python/Workspace/DscBuildData.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index 804eafa619..e8b36a3868 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1295,10 +1295,10 @@ class DscBuildData(PlatformBuildClassObject): if GlobalData.gFdfParser is None: return AllPcds NoFiledValues = GlobalData.gFdfParser.Profile.PcdDict - for Guid,Name,Field in NoFiledValues: + for Name,Guid,Field in NoFiledValues: if len(Field): continue - Value = NoFiledValues[(Guid,Name,Field)] + Value = NoFiledValues[(Name,Guid,Field)] if (Name,Guid) in AllPcds: Pcd = AllPcds.get((Name,Guid)) if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), None),StructurePcd): @@ -1325,7 +1325,7 @@ class DscBuildData(PlatformBuildClassObject): else: PcdInDec = self.DecPcds.get((Name,Guid)) if PcdInDec: - PcdInDec.PcdValueFromComm = Value + PcdInDec.PcdValueFromFdf = Value 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_FEATURE_FLAG]]: