From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B90C922280C23 for ; Wed, 27 Dec 2017 01:32:00 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Dec 2017 01:36:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,464,1508828400"; d="scan'208";a="190274262" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga006.fm.intel.com with ESMTP; 27 Dec 2017 01:36:54 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 27 Dec 2017 01:36:50 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 27 Dec 2017 01:36:50 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Wed, 27 Dec 2017 17:35:38 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Remove 'COMMON' in PCD SkuInfoList Thread-Index: AQHTfth4ya9UJpMkrU2iTZTM9s3hb6NW7l3Q Date: Wed, 27 Dec 2017 09:35:37 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E199437@SHSMSX104.ccr.corp.intel.com> References: <20171227060335.1744-1-bob.c.feng@intel.com> <20171227060335.1744-2-bob.c.feng@intel.com> In-Reply-To: <20171227060335.1744-2-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Remove 'COMMON' in PCD SkuInfoList X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Dec 2017 09:32:01 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >BobCF >Sent: Wednesday, December 27, 2017 2:04 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >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 >Cc: Liming Gao >--- > 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 =3D {} > DefaultStoreObj =3D DefaultStore(self._GetDefaultStores()) >- SkuIds =3D set([(skuid,skuobj.SkuId) for pcdobj in PcdSet.values(= ) for >skuid,skuobj in pcdobj.SkuInfoList.items()]) >- SkuIds =3D self.SkuIdMgr.AvailableSkuIdSet >+ SkuIds =3D {skuname:skuid for skuname,skuid in >self.SkuIdMgr.AvailableSkuIdSet.items() if skuname !=3D'COMMON'} > DefaultStores =3D set([storename for pcdobj in PcdSet.values() fo= r skuobj >in pcdobj.SkuInfoList.values() for storename in >skuobj.DefaultStoreDict.keys()]) > for PcdCName, TokenSpaceGuid in PcdSet: > PcdObj =3D 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