For void* type pcd in command line, if its value is string, code should
not convert the void* pcd string in command line to array, otherwise it
will make the pcd value in report not match its real raw value.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: ZhiqiangX Zhao <zhiqiangx.z...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Yonghong Zhu <yonghong....@intel.com>
Cc: Bob Feng <bob.c.f...@intel.com>
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +-
BaseTools/Source/Python/Workspace/DscBuildData.py | 38 +++++------------------
2 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 804f579f5c..15d9706e35 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1168,7 +1168,7 @@ class PlatformAutoGen(AutoGen):
VariableGuidStructure = Sku.VariableGuidValue
VariableGuid =
GuidStructureStringToGuidString(VariableGuidStructure)
for StorageName in Sku.DefaultStoreDict:
- VariableInfo.append_variable(var_info(Index, pcdname,
StorageName, SkuName, StringToArray(Sku.VariableName), VariableGuid,
Sku.VariableOffset, Sku.VariableAttribute, Sku.HiiDefaultValue,
Sku.DefaultStoreDict[StorageName], Pcd.DatumType,
Pcd.CustomAttribute['DscPosition'], Pcd.CustomAttribute.get('IsStru',False)))
+ VariableInfo.append_variable(var_info(Index, pcdname,
StorageName, SkuName, StringToArray(Sku.VariableName), VariableGuid,
Sku.VariableOffset, Sku.VariableAttribute, Sku.HiiDefaultValue,
Sku.DefaultStoreDict[StorageName] if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES
else StringToArray(Sku.DefaultStoreDict[StorageName]), Pcd.DatumType,
Pcd.CustomAttribute['DscPosition'], Pcd.CustomAttribute.get('IsStru',False)))
Index += 1
return VariableInfo
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
b/BaseTools/Source/Python/Workspace/DscBuildData.py
index b0e88a93ce..7ae2ff0683 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1307,29 +1307,16 @@ class DscBuildData(PlatformBuildClassObject):
if isinstance(self._DecPcds.get((Pcd.TokenCName,
Pcd.TokenSpaceGuidCName), None), StructurePcd):
self._DecPcds.get((Pcd.TokenCName,
Pcd.TokenSpaceGuidCName)).PcdValueFromComm =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
else:
- if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
- Pcd.PcdValueFromComm =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
- Pcd.DefaultValue =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
- else:
- Pcd.PcdValueFromComm =
StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])
- Pcd.DefaultValue =
StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])
+ Pcd.PcdValueFromComm =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
+ Pcd.DefaultValue = NoFiledValues[(Pcd.TokenSpaceGuidCName,
Pcd.TokenCName)][0]
for sku in Pcd.SkuInfoList:
SkuInfo = Pcd.SkuInfoList[sku]
if SkuInfo.DefaultValue:
- if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
- SkuInfo.DefaultValue =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
- else:
- SkuInfo.DefaultValue =
StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])
+ SkuInfo.DefaultValue =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
else:
- if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
- SkuInfo.HiiDefaultValue =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
- else:
- SkuInfo.HiiDefaultValue =
StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])
+ SkuInfo.HiiDefaultValue =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
for defaultstore in SkuInfo.DefaultStoreDict:
- if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
- SkuInfo.DefaultStoreDict[defaultstore] =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
- else:
- SkuInfo.DefaultStoreDict[defaultstore] =
StringToArray(NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0])
+ SkuInfo.DefaultStoreDict[defaultstore] =
NoFiledValues[(Pcd.TokenSpaceGuidCName, Pcd.TokenCName)][0]
if Pcd.Type in
[self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII],
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII]]:
if Pcd.DatumType == TAB_VOID:
if not Pcd.MaxDatumSize:
@@ -1341,26 +1328,17 @@ class DscBuildData(PlatformBuildClassObject):
else:
PcdInDec = self.DecPcds.get((Name, Guid))
if PcdInDec:
- if PcdInDec.DatumType in TAB_PCD_NUMERIC_TYPES:
- PcdInDec.PcdValueFromComm = NoFiledValues[(Guid,
Name)][0]
- else:
- PcdInDec.PcdValueFromComm =
StringToArray(NoFiledValues[(Guid, Name)][0])
+ PcdInDec.PcdValueFromComm = NoFiledValues[(Guid, Name)][0]
if PcdInDec.Type in
[self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE],
self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG],
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC],
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX]]:
self.Pcds[Name, Guid] = copy.deepcopy(PcdInDec)
- if PcdInDec.DatumType in TAB_PCD_NUMERIC_TYPES:
- self.Pcds[Name, Guid].DefaultValue =
NoFiledValues[( Guid, Name)][0]
- else:
- self.Pcds[Name, Guid].DefaultValue =
StringToArray(NoFiledValues[( Guid, Name)][0])
+ self.Pcds[Name, Guid].DefaultValue = NoFiledValues[(
Guid, Name)][0]
if PcdInDec.Type in
[self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC],
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX]]:
- if PcdInDec.DatumType in TAB_PCD_NUMERIC_TYPES:
- self.Pcds[Name, Guid].SkuInfoList =
{TAB_DEFAULT:SkuInfoClass(TAB_DEFAULT, self.SkuIds[TAB_DEFAULT][0], '', '', '',
'', '', NoFiledValues[( Guid, Name)][0])}
- else:
- self.Pcds[Name, Guid].SkuInfoList =
{TAB_DEFAULT:SkuInfoClass(TAB_DEFAULT, self.SkuIds[TAB_DEFAULT][0], '', '', '',
'', '', StringToArray(NoFiledValues[( Guid, Name)][0]))}
+ self.Pcds[Name, Guid].SkuInfoList =
{TAB_DEFAULT:SkuInfoClass(TAB_DEFAULT, self.SkuIds[TAB_DEFAULT][0], '', '', '',
'', '', NoFiledValues[( Guid, Name)][0])}
return AllPcds
def OverrideByFdfOverAll(self,AllPcds):
--
2.14.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
