mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-31 01:24:12 +02:00
BaseTools: VOID* PCDs in VPD region must be aligned based on value type
Base on build spec update, ASCII strings(“string”), will be byte aligned, Unicode strings(L”string”) will be two-byte aligned, Byte arrays, {0x00, 0x01} will be 8-byte aligned. This patch is going to halt with an error message if a VOID* PCD has an offset value that is not aligned based on the syntax of the PCD value. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19650 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
8b54f22f60
commit
5a13737abf
@ -317,6 +317,11 @@ class WorkspaceAutoGen(AutoGen):
|
|||||||
GlobalData.gFdfParser = Fdf
|
GlobalData.gFdfParser = Fdf
|
||||||
GlobalData.gAutoGenPhase = False
|
GlobalData.gAutoGenPhase = False
|
||||||
PcdSet = Fdf.Profile.PcdDict
|
PcdSet = Fdf.Profile.PcdDict
|
||||||
|
FdDict = Fdf.Profile.FdDict[Fdf.CurrentFdName]
|
||||||
|
for FdRegion in FdDict.RegionList:
|
||||||
|
if str(FdRegion.RegionType) is 'FILE' and self.Platform.VpdToolGuid in str(FdRegion.RegionDataList):
|
||||||
|
if int(FdRegion.Offset) % 8 != 0:
|
||||||
|
EdkLogger.error("build", FORMAT_INVALID, 'The VPD Base Address %s must be 8-byte aligned.' % (FdRegion.Offset))
|
||||||
ModuleList = Fdf.Profile.InfList
|
ModuleList = Fdf.Profile.InfList
|
||||||
self.FdfProfile = Fdf.Profile
|
self.FdfProfile = Fdf.Profile
|
||||||
for fvname in self.FvTargetList:
|
for fvname in self.FvTargetList:
|
||||||
@ -1138,6 +1143,18 @@ class PlatformAutoGen(AutoGen):
|
|||||||
Pcd = VpdPcdDict[PcdKey]
|
Pcd = VpdPcdDict[PcdKey]
|
||||||
for (SkuName,Sku) in Pcd.SkuInfoList.items():
|
for (SkuName,Sku) in Pcd.SkuInfoList.items():
|
||||||
Sku.VpdOffset = Sku.VpdOffset.strip()
|
Sku.VpdOffset = Sku.VpdOffset.strip()
|
||||||
|
PcdValue = Sku.DefaultValue
|
||||||
|
if PcdValue == "":
|
||||||
|
PcdValue = Pcd.DefaultValue
|
||||||
|
if Sku.VpdOffset != '*':
|
||||||
|
if PcdValue.startswith("{"):
|
||||||
|
Alignment = 8
|
||||||
|
elif PcdValue.startswith("L"):
|
||||||
|
Alignment = 2
|
||||||
|
else:
|
||||||
|
Alignment = 1
|
||||||
|
if int(Sku.VpdOffset) % Alignment != 0:
|
||||||
|
EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Alignment))
|
||||||
VpdFile.Add(Pcd, Sku.VpdOffset)
|
VpdFile.Add(Pcd, Sku.VpdOffset)
|
||||||
# if the offset of a VPD is *, then it need to be fixed up by third party tool.
|
# if the offset of a VPD is *, then it need to be fixed up by third party tool.
|
||||||
if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":
|
if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":
|
||||||
@ -1193,6 +1210,17 @@ class PlatformAutoGen(AutoGen):
|
|||||||
# Sku = DscPcdEntry.SkuInfoList[DscPcdEntry.SkuInfoList.keys()[0]]
|
# Sku = DscPcdEntry.SkuInfoList[DscPcdEntry.SkuInfoList.keys()[0]]
|
||||||
Sku.VpdOffset = Sku.VpdOffset.strip()
|
Sku.VpdOffset = Sku.VpdOffset.strip()
|
||||||
PcdValue = Sku.DefaultValue
|
PcdValue = Sku.DefaultValue
|
||||||
|
if PcdValue == "":
|
||||||
|
PcdValue = DscPcdEntry.DefaultValue
|
||||||
|
if Sku.VpdOffset != '*':
|
||||||
|
if PcdValue.startswith("{"):
|
||||||
|
Alignment = 8
|
||||||
|
elif PcdValue.startswith("L"):
|
||||||
|
Alignment = 2
|
||||||
|
else:
|
||||||
|
Alignment = 1
|
||||||
|
if int(Sku.VpdOffset) % Alignment != 0:
|
||||||
|
EdkLogger.error("build", FORMAT_INVALID, 'The offset value of PCD %s.%s should be %s-byte aligned.' % (DscPcdEntry.TokenSpaceGuidCName, DscPcdEntry.TokenCName, Alignment))
|
||||||
VpdFile.Add(DscPcdEntry, Sku.VpdOffset)
|
VpdFile.Add(DscPcdEntry, Sku.VpdOffset)
|
||||||
if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":
|
if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":
|
||||||
NeedProcessVpdMapFile = True
|
NeedProcessVpdMapFile = True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user