From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 141422222758A for ; Sun, 7 Jan 2018 22:06:26 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2018 22:11:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,329,1511856000"; d="scan'208";a="8645609" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga007.jf.intel.com with ESMTP; 07 Jan 2018 22:11:34 -0800 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 7 Jan 2018 22:11:33 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sun, 7 Jan 2018 22:11:33 -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; Mon, 8 Jan 2018 14:11:31 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Add back the cc71d8 version's fix Thread-Index: AQHThT30W1FXU4KB/0WQEijmbHW/0KNphI2w Date: Mon, 8 Jan 2018 06:11:30 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1A0326@SHSMSX104.ccr.corp.intel.com> References: <1515057893-9536-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1515057893-9536-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: Add back the cc71d8 version's fix 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: Mon, 08 Jan 2018 06:06:27 -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 >Yonghong Zhu >Sent: Thursday, January 04, 2018 5:25 PM >To: edk2-devel@lists.01.org >Subject: [edk2] [Patch] BaseTools: Add back the cc71d8 version's fix > >The version cc71d8's fix was washed out by structure pcd report patch. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/build/BuildReport.py | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > >diff --git a/BaseTools/Source/Python/build/BuildReport.py >b/BaseTools/Source/Python/build/BuildReport.py >index d2ac044..d6e943d 100644 >--- a/BaseTools/Source/Python/build/BuildReport.py >+++ b/BaseTools/Source/Python/build/BuildReport.py >@@ -869,11 +869,11 @@ class PcdReport(object): > # Collect PCDs defined in DSC common section > # > self.DscPcdDefault =3D {} > for Pa in Wa.AutoGenObjectList: > for (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds: >- DscDefaultValue =3D Pa.Platform.Pcds[(TokenCName, >TokenSpaceGuidCName)].DefaultValue >+ DscDefaultValue =3D Pa.Platform.Pcds[(TokenCName, >TokenSpaceGuidCName)].DscDefaultValue > if DscDefaultValue: > self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)]= =3D >DscDefaultValue > > def GenerateReport(self, File, ModulePcdSet): > if self.ConditionalPcds: >@@ -1032,21 +1032,21 @@ class PcdReport(object): > DecMatch =3D False > # > # Report PCD item according to their override relatio= nship > # > if DecMatch and InfMatch: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, Type= Name, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, ' ') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, Type= Name, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, ' ') > elif BuildOptionMatch: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, Type= Name, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*B') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, Type= Name, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*B') > else: > if DscMatch: > if (Pcd.TokenCName, Key) in self.FdfPcdSet: >- self.PrintPcdValue(File, Pcd, PcdTokenCNa= me, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*F') >+ self.PrintPcdValue(File, Pcd, PcdTokenCNa= me, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*F') > else: >- self.PrintPcdValue(File, Pcd, PcdTokenCNa= me, TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*P') >+ self.PrintPcdValue(File, Pcd, PcdTokenCNa= me, TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*P') > else: >- self.PrintPcdValue(File, Pcd, PcdTokenCName, = TypeName, >IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*M') >+ self.PrintPcdValue(File, Pcd, PcdTokenCName, = TypeName, >IsStructure, DscMatch, DscDefaultValBak, InfMatch, InfDefaultValue, >DecMatch, DecDefaultValue, '*M') > > if ModulePcdSet =3D=3D None: > if IsStructure: > continue > if not TypeName in ('PATCH', 'FLAG', 'FIXED'): >-- >2.6.1.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel