BaseTools: Fixed the issue of Multiple Skus are always disables

[mirror_edk2.git] / BaseTools / Source / Python / build / BuildReport.py

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index e1adaabe0c127c2482714e0e2d526fd26c674c1e..75e8ec97ab8a74e224aebc4008627099c8c5384b 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1014,7 +1014,7 @@ class PcdReport(object):
                         Pcd.DatumType = Pcd.StructName\r
                         if TypeName in ('DYNVPD', 'DEXVPD'):\r
                             Pcd.SkuInfoList = SkuInfoList\r
-                        if Pcd.OverrideValues:\r
+                        if Pcd.SkuOverrideValues:\r
                             DscMatch = True\r
                             DecMatch = False\r
                     #\r
@@ -1107,7 +1107,7 @@ class PcdReport(object):
             else:\r
                 FileWrite(File, ' %-*s   : %6s %10s = %s' % (self.MaxLen, Flag + ' ' + PcdTokenCName, TypeName, '(' + Pcd.DatumType + ')', Value))\r
             if IsStructure:\r
-                OverrideValues = Pcd.OverrideValues\r
+                OverrideValues = Pcd.SkuOverrideValues\r
                 if OverrideValues:\r
                     Keys = OverrideValues.keys()\r
                     Data = OverrideValues[Keys[0]]\r
@@ -1142,7 +1142,7 @@ class PcdReport(object):
                                     FileWrite(File, ' %-*s   : %6s %10s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', '(' + DefaultStore + ')', Value))\r
                             FileWrite(File, '%*s: %s: %s' % (self.MaxLen + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset))\r
                             if IsStructure:\r
-                                OverrideValues = Pcd.OverrideValues[Sku]\r
+                                OverrideValues = Pcd.SkuOverrideValues[Sku]\r
                                 Struct = OverrideValues[DefaultStore]\r
                                 self.PrintStructureInfo(File, Struct)\r
                             self.PrintPcdDefault(File, Pcd, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue)\r
@@ -1166,7 +1166,7 @@ class PcdReport(object):
                             FileWrite(File, ' %-*s   : %6s %10s %10s = %s' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))\r
                     FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.VpdOffset))\r
                     if IsStructure:\r
-                        OverrideValues = Pcd.OverrideValues[Sku]\r
+                        OverrideValues = Pcd.SkuOverrideValues[Sku]\r
                         if OverrideValues:\r
                             Keys = OverrideValues.keys()\r
                             Struct = OverrideValues[Keys[0]]\r
@@ -1191,7 +1191,7 @@ class PcdReport(object):
                         else:\r
                             FileWrite(File, ' %-*s   : %6s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))\r
                     if IsStructure:\r
-                        OverrideValues = Pcd.OverrideValues[Sku]\r
+                        OverrideValues = Pcd.SkuOverrideValues[Sku]\r
                         if OverrideValues:\r
                             Keys = OverrideValues.keys()\r
                             Struct = OverrideValues[Keys[0]]\r