diff options
| author | Liming Gao <liming.gao@intel.com> | 2017-12-01 22:00:07 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2017-12-25 11:05:50 +0800 |
| commit | 65eff519e5ef56ddf51b11ed3524f55854e49dde (patch) | |
| tree | fa17cbce46ed3d1ba7882ad6be95784f08a1a14f /BaseTools/Source/Python/build/BuildReport.py | |
| parent | 626bece451db2e2a19fa7696889ad4d4c441b16e (diff) | |
| download | edk2-65eff519e5ef56ddf51b11ed3524f55854e49dde.tar.gz edk2-65eff519e5ef56ddf51b11ed3524f55854e49dde.tar.bz2 edk2-65eff519e5ef56ddf51b11ed3524f55854e49dde.zip | |
BaseTools: Fixed the issue of Multiple Skus are always disables
When multiple skus are enabled, PCD database should record the supported SKUs.
This patch fixes PCD database to add the missing supported SKUs.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@Intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/build/BuildReport.py')
| -rw-r--r-- | BaseTools/Source/Python/build/BuildReport.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index e1adaabe0c..75e8ec97ab 100644 --- 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
if TypeName in ('DYNVPD', 'DEXVPD'):
Pcd.SkuInfoList = SkuInfoList
- if Pcd.OverrideValues:
+ if Pcd.SkuOverrideValues:
DscMatch = True
DecMatch = False
#
@@ -1107,7 +1107,7 @@ class PcdReport(object): else:
FileWrite(File, ' %-*s : %6s %10s = %s' % (self.MaxLen, Flag + ' ' + PcdTokenCName, TypeName, '(' + Pcd.DatumType + ')', Value))
if IsStructure:
- OverrideValues = Pcd.OverrideValues
+ OverrideValues = Pcd.SkuOverrideValues
if OverrideValues:
Keys = OverrideValues.keys()
Data = OverrideValues[Keys[0]]
@@ -1142,7 +1142,7 @@ class PcdReport(object): FileWrite(File, ' %-*s : %6s %10s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', '(' + DefaultStore + ')', Value))
FileWrite(File, '%*s: %s: %s' % (self.MaxLen + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset))
if IsStructure:
- OverrideValues = Pcd.OverrideValues[Sku]
+ OverrideValues = Pcd.SkuOverrideValues[Sku]
Struct = OverrideValues[DefaultStore]
self.PrintStructureInfo(File, Struct)
self.PrintPcdDefault(File, Pcd, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue)
@@ -1166,7 +1166,7 @@ class PcdReport(object): FileWrite(File, ' %-*s : %6s %10s %10s = %s' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))
FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.VpdOffset))
if IsStructure:
- OverrideValues = Pcd.OverrideValues[Sku]
+ OverrideValues = Pcd.SkuOverrideValues[Sku]
if OverrideValues:
Keys = OverrideValues.keys()
Struct = OverrideValues[Keys[0]]
@@ -1191,7 +1191,7 @@ class PcdReport(object): else:
FileWrite(File, ' %-*s : %6s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))
if IsStructure:
- OverrideValues = Pcd.OverrideValues[Sku]
+ OverrideValues = Pcd.SkuOverrideValues[Sku]
if OverrideValues:
Keys = OverrideValues.keys()
Struct = OverrideValues[Keys[0]]
|