sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Fixed some small issues

Browse Source 
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>
This commit is contained in:
Feng, Bob C
2018-01-23 11:34:45 +08:00
committed by Liming Gao
parent 841d86fe40
commit 8e011d83bb
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -1751,8 +1751,8 @@ class PlatformAutoGen(AutoGen):
PcdValue = DefaultSku.DefaultValue PcdValue = DefaultSku.DefaultValue
if PcdValue not in SkuValueMap: if PcdValue not in SkuValueMap:
SkuValueMap[PcdValue] = [] SkuValueMap[PcdValue] = []
VpdFile.Add(DscPcdEntry, 'DEFAULT',Sku.VpdOffset) VpdFile.Add(DscPcdEntry, 'DEFAULT',DefaultSku.VpdOffset)
SkuValueMap[PcdValue].append(Sku) SkuValueMap[PcdValue].append(DefaultSku)
for (SkuName,Sku) in DscPcdEntry.SkuInfoList.items(): for (SkuName,Sku) in DscPcdEntry.SkuInfoList.items():
Sku.VpdOffset = Sku.VpdOffset.strip() Sku.VpdOffset = Sku.VpdOffset.strip()

7
BaseTools/Source/Python/Workspace/DscBuildData.py
View File

@ -1298,8 +1298,11 @@ class DscBuildData(PlatformBuildClassObject):
CApp = CApp + ' %s *Pcd; // From %s Line %d \n' % (Pcd.DatumType, Pcd.PkgPath, Pcd.PcdDefineLineNo) CApp = CApp + ' %s *Pcd; // From %s Line %d \n' % (Pcd.DatumType, Pcd.PkgPath, Pcd.PcdDefineLineNo)
CApp = CApp + '\n' CApp = CApp + '\n'
Pcd.DefaultValue = Pcd.DefaultValue.strip() if SkuName in Pcd.SkuInfoList:
PcdDefaultValue = StringToArray(Pcd.DefaultValue) 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) InitByteValue += '%s.%s.%s.%s|%s|%s\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType, PcdDefaultValue)

3
BaseTools/Source/Python/Workspace/MetaFileParser.py
View File

@ -1915,6 +1915,9 @@ class DecParser(MetaFileParser):
if len(PcdNames) == 2: if len(PcdNames) == 2:
self._CurrentStructurePcdName = "" self._CurrentStructurePcdName = ""
else: 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[1] = TAB_SPLIT.join(PcdNames[2:])
self._ValueList[2] = PcdTockens[1] self._ValueList[2] = PcdTockens[1]
if not self._CurrentStructurePcdName: if not self._CurrentStructurePcdName: