From 8e011d83bbd7006919c00917fbdfaf7a60edae21 Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Tue, 23 Jan 2018 11:34:45 +0800 Subject: 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 Cc: Liming Gao Reviewed-by: Liming Gao --- BaseTools/Source/Python/Workspace/DscBuildData.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/Workspace/DscBuildData.py') 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) -- cgit v1.2.3