diff options
| author | BobCF <bob.c.feng@intel.com> | 2017-12-27 14:03:35 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2017-12-27 17:40:38 +0800 |
| commit | 98eb13643750a2f3cc3e5a1fc2ea89e5c1d0ae8e (patch) | |
| tree | cdd0464db7f737209db3789d037cd62d171d1f30 /BaseTools | |
| parent | 08ba82934ebd026a0ea18405df847f0cda0441f5 (diff) | |
| download | edk2-98eb13643750a2f3cc3e5a1fc2ea89e5c1d0ae8e.tar.gz edk2-98eb13643750a2f3cc3e5a1fc2ea89e5c1d0ae8e.tar.bz2 edk2-98eb13643750a2f3cc3e5a1fc2ea89e5c1d0ae8e.zip | |
BaseTools: Remove 'COMMON' in PCD SkuInfoList
'COMMON' is an alias of 'DEFAULT' for internal code,
it should be removed before generating Pcd DataBase.
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')
| -rw-r--r-- | BaseTools/Source/Python/Workspace/DscBuildData.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py index f9cd429f29..a9117afa5c 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1716,8 +1716,7 @@ class DscBuildData(PlatformBuildClassObject): def CompletePcdValues(self,PcdSet):
Pcds = {}
DefaultStoreObj = DefaultStore(self._GetDefaultStores())
- SkuIds = set([(skuid,skuobj.SkuId) for pcdobj in PcdSet.values() for skuid,skuobj in pcdobj.SkuInfoList.items()])
- SkuIds = self.SkuIdMgr.AvailableSkuIdSet
+ SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname !='COMMON'}
DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])
for PcdCName, TokenSpaceGuid in PcdSet:
PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]
|