Reviewed-by: Liming Gao <liming....@intel.com>
>-----Original Message----- >From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of >BobCF >Sent: Wednesday, December 27, 2017 2:04 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming <liming....@intel.com> >Subject: [edk2] [Patch] 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.f...@intel.com> >Cc: Liming Gao <liming....@intel.com> >--- > BaseTools/Source/Python/Workspace/DscBuildData.py | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py >b/BaseTools/Source/Python/Workspace/DscBuildData.py >index e4f3586654..929c317957 100644 >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py >@@ -1706,12 +1706,11 @@ class DscBuildData(PlatformBuildClassObject): > else: > return False > 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)] > if PcdObj.Type not in >[self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT], > self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], >-- >2.14.3.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
