BaseTools: Fix Sku inherit issue.

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DscBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 97ce5b24620c7949e4e0b9c95f81b3d5ed1b39d7..4a87fd17629467fc0536ccf0a769943e053bafe3 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1327,7 +1327,7 @@ class DscBuildData(PlatformBuildClassObject):
                         while '[' in FieldName:\r
                             FieldName = FieldName.rsplit('[', 1)[0]\r
                             CApp = CApp + '  __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)\r
-            for skuname in self.SkuIdMgr.SkuOverrideOrder():\r
+            for skuname in self.SkuIdMgr.GetSkuChain(SkuName):\r
                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]\r
                 for FieldList in [inherit_OverrideValues.get(DefaultStoreName)]:\r
                     if not FieldList:\r
@@ -1391,7 +1391,7 @@ class DscBuildData(PlatformBuildClassObject):
                             CApp = CApp + '  Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
                         else:\r
                             CApp = CApp + '  Pcd->%s = %d; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
-            for skuname in self.SkuIdMgr.SkuOverrideOrder():\r
+            for skuname in self.SkuIdMgr.GetSkuChain(SkuName):\r
                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]\r
                 for FieldList in [Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:\r
                     if not FieldList:\r