From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 5A2DB21E8796F for ; Sun, 10 Sep 2017 19:48:54 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2017 19:51:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,375,1500966000"; d="scan'208";a="1217053132" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga002.fm.intel.com with ESMTP; 10 Sep 2017 19:51:48 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 10 Sep 2017 19:51:48 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 10 Sep 2017 19:51:48 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.117]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.219]) with mapi id 14.03.0319.002; Mon, 11 Sep 2017 10:51:48 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix a bug for Mixed Pcd value display in the report Thread-Index: AQHTKg58wdW/vRjbbUCBLASEkZ6yo6Ku/bGQ Date: Mon, 11 Sep 2017 02:51:46 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E13980B@SHSMSX104.ccr.corp.intel.com> References: <1505031956-8720-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1505031956-8720-1-git-send-email-yonghong.zhu@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: Fix a bug for Mixed Pcd value display in the report X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 02:48:54 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Zhu, Yonghong >Sent: Sunday, September 10, 2017 4:26 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [Patch] BaseTools: Fix a bug for Mixed Pcd value display in the r= eport > >the case is that override the mixed pcd value in DSC [Components] >section, the value display in the report is incorrect. > >Cc: Liming Gao >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/AutoGen/AutoGen.py | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > >diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py >b/BaseTools/Source/Python/AutoGen/AutoGen.py >index cd30894..8293672 100644 >--- a/BaseTools/Source/Python/AutoGen/AutoGen.py >+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py >@@ -2333,12 +2333,22 @@ class PlatformAutoGen(AutoGen): > > # override PCD settings with module specific setting > if Module in self.Platform.Modules: > PlatformModule =3D self.Platform.Modules[str(Module)] > for Key in PlatformModule.Pcds: >+ Flag =3D False > if Key in Pcds: >- self._OverridePcd(Pcds[Key], PlatformModule.Pcds[Key]= , Module) >+ ToPcd =3D Pcds[Key] >+ Flag =3D True >+ elif Key in GlobalData.MixedPcd: >+ for PcdItem in GlobalData.MixedPcd[Key]: >+ if PcdItem in Pcds: >+ ToPcd =3D Pcds[PcdItem] >+ Flag =3D True >+ break >+ if Flag: >+ self._OverridePcd(ToPcd, PlatformModule.Pcds[Key], Mo= dule) > return Pcds.values() > > ## Resolve library names to library modules > # > # (for Edk.x modules) >-- >2.6.1.windows.1