X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FWorkspace%2FDscBuildData.py;h=e8b36a38684b3f7b11d2beb11e0a953d3d8c5855;hp=804eafa619184ca5946d4c4300127be09b04f12b;hb=4c6d0de7bad46fc15fd34d394dffda3766e3a6a1;hpb=2add3cffb075de8a705c9d887dd25624c89d2349

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]]: