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/Workspace/DscBuildData.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/Workspace/DscBuildData.py')
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index ca782aef23..39db945fb8 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1536,6 +1536,7 @@ class DscBuildData(PlatformBuildClassObject): str_pcd_obj.MaxDatumSize = self.GetStructurePcdMaxSize(str_pcd_obj)
Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName] = str_pcd_obj
+ Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName].CustomAttribute['IsStru']=True
for pcdkey in Pcds:
pcd = Pcds[pcdkey]
@@ -2680,6 +2681,7 @@ class DscBuildData(PlatformBuildClassObject): PcdClassObj.UserDefinedDefaultStoresFlag = True
Pcds[PcdCName, TokenSpaceGuid] = PcdClassObj
+ Pcds[PcdCName, TokenSpaceGuid].CustomAttribute['DscPosition'] = int(Dummy4)
if SkuName not in Pcds[PcdCName, TokenSpaceGuid].DscRawValue:
Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName] = {}
Pcds[PcdCName, TokenSpaceGuid].DscRawValue[SkuName][DefaultStore] = DefaultValue
|