diff options
| author | bob.c.feng@intel.com <bob.c.feng@intel.com> | 2018-09-25 10:55:30 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-09-26 22:50:40 +0800 |
| commit | 6a147d6dae733f3a1d5ddf9af9adce5fb8504a53 (patch) | |
| tree | 4894ab62afccfe0137c5b6c86edac2c84c69c83b /BaseTools/Source/Python/AutoGen/AutoGen.py | |
| parent | 57ee97c01ca0e81d146600a00885719b84bf1581 (diff) | |
| download | edk2-6a147d6dae733f3a1d5ddf9af9adce5fb8504a53.tar.gz edk2-6a147d6dae733f3a1d5ddf9af9adce5fb8504a53.tar.bz2 edk2-6a147d6dae733f3a1d5ddf9af9adce5fb8504a53.zip | |
BaseTool: Support different PCDs that refers to the same EFI variable.
If Structure PCD and Normal Pcd refer to the
same EFI variable, do EFI variable merge, otherwise, do
EFI variable combination.
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/Source/Python/AutoGen/AutoGen.py')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 38f126095d..7c0bb47f77 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))
+ 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)))
Index += 1
return VariableInfo
@@ -2057,6 +2057,7 @@ class PlatformAutoGen(AutoGen): ToPcd.validateranges = FromPcd.validateranges
ToPcd.validlists = FromPcd.validlists
ToPcd.expressions = FromPcd.expressions
+ ToPcd.CustomAttribute = FromPcd.CustomAttribute
if FromPcd is not None and ToPcd.DatumType == TAB_VOID and not ToPcd.MaxDatumSize:
EdkLogger.debug(EdkLogger.DEBUG_9, "No MaxDatumSize specified for PCD %s.%s" \
|