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=jaben.carsey@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 EE69321167455 for ; Thu, 18 Oct 2018 07:18:30 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Oct 2018 07:18:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,396,1534834800"; d="scan'208";a="272400305" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga005.fm.intel.com with ESMTP; 18 Oct 2018 07:18:30 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 18 Oct 2018 07:18:30 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.16]) by FMSMSX155.amr.corp.intel.com ([169.254.5.155]) with mapi id 14.03.0319.002; Thu, 18 Oct 2018 07:18:29 -0700 From: "Carsey, Jaben" To: "Gao, Liming" , "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Fix a bug --pcd option enable and use the pcd in expression Thread-Index: AQHUZbFcG5Yf9vv1206uTeb3IvxxUaUkpt+AgABonOA= Date: Thu, 18 Oct 2018 14:18:29 +0000 Message-ID: References: <1539736541-5448-1-git-send-email-yonghong.zhu@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E33CF36@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E33CF36@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMGI0MTg5ZGYtMTY3Ni00MGVhLTljNjYtZjU0MDMyMTg1YzViIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMnZUTmVVNWRaakdldEpmeXBLa2pDWndVXC85MDFNN2lIR2hmdDNyK2s4bkJqMEpQbEJobEpYblBSYzhCWm1wOUEifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.1.200.106] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix a bug --pcd option enable and use the pcd in expression X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2018 14:18:31 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Gao, Liming > Sent: Wednesday, October 17, 2018 6:04 PM > To: Zhu, Yonghong ; edk2-devel@lists.01.org > Subject: Re: [edk2] [Patch] BaseTools: Fix a bug --pcd option enable and = use > the pcd in expression >=20 > Reviewed-by: Liming Gao >=20 > >-----Original Message----- > >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > >Yonghong Zhu > >Sent: Wednesday, October 17, 2018 8:36 AM > >To: edk2-devel@lists.01.org > >Subject: [edk2] [Patch] BaseTools: Fix a bug --pcd option enable and use= the > >pcd in expression > > > >the case is: > >in the DSC: > >[PcdsFixedAtBuild.common] > > TokenSpaceGuid.TestFixedPcd|0xFFEAA000 > > > >[PcdsDynamicExDefault.common.DEFAULT] > >!if TokenSpaceGuid.PcdFlag =3D=3D TRUE > >TokenSpaceGuid.PcdTest|TokenSpaceGuid.TestFixedPcd > >!endif > > > >Then build with --pcd TokenSpaceGuid.PcdFlag=3DTRUE, it report failure, > >but if we build without this --pcd option, it could build success. > >we found when the --pcd is enabled, the fixedatbuild pcds are not be > >collected into expression to calculate. > > > >Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1256 > >Contributed-under: TianoCore Contribution Agreement 1.1 > >Signed-off-by: Yonghong Zhu > >--- > > BaseTools/Source/Python/Workspace/DscBuildData.py | 1 + > > 1 file changed, 1 insertion(+) > > > >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py > >b/BaseTools/Source/Python/Workspace/DscBuildData.py > >index f41038e..ace348b 100644 > >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py > >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > >@@ -2942,6 +2942,7 @@ class DscBuildData(PlatformBuildClassObject): > > if ModuleFile in self._Modules: > > continue > > ModuleData =3D self._Bdb[ModuleFile, self._Arch, self._= Target, > >self._Toolchain] > > PkgSet.update(ModuleData.Packages) > > self._DecPcds, self._GuidDict =3D GetDeclaredPcd(self, self= ._Bdb, > >self._Arch, self._Target, self._Toolchain, PkgSet) > >+ self._GuidDict.update(GlobalData.gPlatformPcds) > > return self._DecPcds > >-- > >2.6.1.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