diff options
| author | Feng, Bob C <bob.c.feng@intel.com> | 2018-01-23 11:34:45 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-01-25 18:08:07 +0800 |
| commit | 8e011d83bbd7006919c00917fbdfaf7a60edae21 (patch) | |
| tree | 36125d90add09ca93fd05a5e79c8ee2f6c8873bc /BaseTools | |
| parent | 841d86fe406ed6cf504c62b6838876a65cf8f7a0 (diff) | |
| download | edk2-8e011d83bbd7006919c00917fbdfaf7a60edae21.tar.gz edk2-8e011d83bbd7006919c00917fbdfaf7a60edae21.tar.bz2 edk2-8e011d83bbd7006919c00917fbdfaf7a60edae21.zip | |
BaseTools: Fixed some small issues
1. The structure pcd default value should use the default value under sku.
2. Incorrect VpdOffset value for those un-used in module Vpd
3. Add a checkpoint for Structure Pcd Name
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 4 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 7 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Workspace/MetaFileParser.py | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 053c2bbcc4..2800820b72 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1751,8 +1751,8 @@ class PlatformAutoGen(AutoGen): PcdValue = DefaultSku.DefaultValue
if PcdValue not in SkuValueMap:
SkuValueMap[PcdValue] = []
- VpdFile.Add(DscPcdEntry, 'DEFAULT',Sku.VpdOffset)
- SkuValueMap[PcdValue].append(Sku)
+ VpdFile.Add(DscPcdEntry, 'DEFAULT',DefaultSku.VpdOffset)
+ SkuValueMap[PcdValue].append(DefaultSku)
for (SkuName,Sku) in DscPcdEntry.SkuInfoList.items():
Sku.VpdOffset = Sku.VpdOffset.strip()
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index c8dba63015..f30d3f7e73 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1298,8 +1298,11 @@ class DscBuildData(PlatformBuildClassObject): CApp = CApp + ' %s *Pcd; // From %s Line %d \n' % (Pcd.DatumType, Pcd.PkgPath, Pcd.PcdDefineLineNo)
CApp = CApp + '\n'
- Pcd.DefaultValue = Pcd.DefaultValue.strip()
- PcdDefaultValue = StringToArray(Pcd.DefaultValue)
+ if SkuName in Pcd.SkuInfoList:
+ DefaultValue = Pcd.SkuInfoList[SkuName].DefaultStoreDict.get(DefaultStoreName,Pcd.SkuInfoList[SkuName].HiiDefaultValue) if Pcd.SkuInfoList[SkuName].HiiDefaultValue else Pcd.SkuInfoList[SkuName].DefaultValue
+ else:
+ DefaultValue = Pcd.DefaultValue
+ PcdDefaultValue = StringToArray(DefaultValue.strip())
InitByteValue += '%s.%s.%s.%s|%s|%s\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType, PcdDefaultValue)
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index d704809354..8f4b5e5cc1 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1915,6 +1915,9 @@ class DecParser(MetaFileParser): if len(PcdNames) == 2:
self._CurrentStructurePcdName = ""
else:
+ if self._CurrentStructurePcdName != TAB_SPLIT.join(PcdNames[:2]):
+ EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Name does not match: %s and %s " % (self._CurrentStructurePcdName , TAB_SPLIT.join(PcdNames[:2])),
+ File=self.MetaFile, Line=self._LineIndex + 1)
self._ValueList[1] = TAB_SPLIT.join(PcdNames[2:])
self._ValueList[2] = PcdTockens[1]
if not self._CurrentStructurePcdName:
|