diff options
| author | BobCF <bob.c.feng@intel.com> | 2017-12-27 14:03:34 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-01-08 11:32:04 +0800 |
| commit | 09c80b07b4a9d3a8b89ffdc55967d38cc651e27e (patch) | |
| tree | 1a641f439ef7ec83a5116485f807dd21ac81ed8e /BaseTools | |
| parent | 4cc824283ce5d87d974a9b5677d925684201b0f5 (diff) | |
| download | edk2-09c80b07b4a9d3a8b89ffdc55967d38cc651e27e.tar.gz edk2-09c80b07b4a9d3a8b89ffdc55967d38cc651e27e.tar.bz2 edk2-09c80b07b4a9d3a8b89ffdc55967d38cc651e27e.zip | |
BaseTools: Fix Sku inherit issue.
The final Pcd value should only be override by its parents.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Feng Bob C <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/Python/Common/Misc.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 15ad9e4f2e..a8ed718aa5 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -2251,6 +2251,8 @@ class SkuClass(): return self.__SkuInherit.get(skuname,"DEFAULT")
def GetSkuChain(self,sku):
+ if sku == "DEFAULT":
+ return ["DEFAULT"]
skulist = [sku]
nextsku = sku
while 1:
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index 97ce5b2462..4a87fd1762 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1327,7 +1327,7 @@ class DscBuildData(PlatformBuildClassObject): while '[' in FieldName:
FieldName = FieldName.rsplit('[', 1)[0]
CApp = CApp + ' __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)
- for skuname in self.SkuIdMgr.SkuOverrideOrder():
+ for skuname in self.SkuIdMgr.GetSkuChain(SkuName):
inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
for FieldList in [inherit_OverrideValues.get(DefaultStoreName)]:
if not FieldList:
@@ -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])
else:
CApp = CApp + ' Pcd->%s = %d; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])
- for skuname in self.SkuIdMgr.SkuOverrideOrder():
+ for skuname in self.SkuIdMgr.GetSkuChain(SkuName):
inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
for FieldList in [Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:
if not FieldList:
|