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.88; helo=mga01.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 CA5C821959CB2 for ; Fri, 12 Oct 2018 06:31:26 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Oct 2018 06:31:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,372,1534834800"; d="scan'208";a="265137245" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga005.jf.intel.com with ESMTP; 12 Oct 2018 06:31:25 -0700 Received: from fmsmsx154.amr.corp.intel.com (10.18.116.70) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 12 Oct 2018 06:31:25 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX154.amr.corp.intel.com (10.18.116.70) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 12 Oct 2018 06:31:24 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.48]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.245]) with mapi id 14.03.0319.002; Fri, 12 Oct 2018 21:31:22 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [PATCH] BaseTools: Not compare the VOID* difference in the DSC and DEC file Thread-Index: AQHUYdLOVHU3S5NVlkq5V/1soAbKZ6Ubm/0Q Date: Fri, 12 Oct 2018 13:31:21 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3393D1@SHSMSX104.ccr.corp.intel.com> References: <1539310822-11284-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1539310822-11284-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDRkMmJlNTQtMGU0My00MGFhLTllZGEtZmE5YjU5ZjA2ZmZmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiV0ZpbkN5R2lYbUlWTHJzQW90XC9BeTE1YkFDbGRUY1ExMmlseGo0UGNTS0VSZ1k0eUxpQnNUc2duXC9WUVZrMFVjIn0= dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools: Not compare the VOID* difference in the DSC and DEC file 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: Fri, 12 Oct 2018 13:31: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 Yo= nghong Zhu > Sent: Friday, October 12, 2018 10:20 AM > To: edk2-devel@lists.01.org > Subject: [edk2] [PATCH] BaseTools: Not compare the VOID* difference in th= e DSC and DEC file >=20 > For structure Pcd, the type defined in the DEC file is the struct name > while if this Pcd used in the DSC file, it should add VOID* keywords > when it have max size info. so this patch filter the type compare for > this case. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/Workspace/DscBuildData.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTool= s/Source/Python/Workspace/DscBuildData.py > index 02aae3a67b..5ed879c8d7 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -935,11 +935,12 @@ class DscBuildData(PlatformBuildClassObject): > Valid, ErrStr =3D CheckPcdDatum(self._DecPcds[PcdCName, Toke= nSpaceGuid].DatumType, ValueList[Index]) > if not Valid: > EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=3D= self.MetaFile, Line=3DLineNo, > ExtraData=3D"%s.%s" % (TokenSpaceGuid, P= cdCName)) > if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_= EX_DEFAULT, MODEL_PCD_FIXED_AT_BUILD, > MODEL_PCD_PATCHABLE_IN_MODULE): > - if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.str= ip() !=3D ValueList[1].strip(): > + if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.str= ip() in TAB_PCD_NUMERIC_TYPES_VOID \ > + and self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.s= trip() !=3D ValueList[1].strip(): > EdkLogger.error('build', FORMAT_INVALID, "Pcd datumt= ype used in DSC file is not the same as its declaration > in DEC file.", File=3Dself.MetaFile, Line=3DLineNo, > ExtraData=3D"%s.%s|%s" % (TokenSpaceGuid= , PcdCName, Setting)) > if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds= : > if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName]= !=3D ValueList[Index]: > GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName= ] =3D ValueList[Index] > -- > 2.12.2.windows.2 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel