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=yonghong.zhu@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 4C5BD2233377E for ; Mon, 22 Jan 2018 20:26:17 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2018 20:31:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,399,1511856000"; d="scan'208";a="12423277" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga008.fm.intel.com with ESMTP; 22 Jan 2018 20:31:44 -0800 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 22 Jan 2018 20:31:43 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 22 Jan 2018 20:31:43 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.159]) with mapi id 14.03.0319.002; Tue, 23 Jan 2018 12:31:41 +0800 From: "Zhu, Yonghong" To: "Feng, Bob C" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [edk2] [Patch] BaseTools: Fixed some small issues 1. The structure pcd default value should use the default value under sku. 2. Incorrect VpdOffset value for those un-used in module Vpd 3. Add a checkpoint for Structure Pcd Name Thread-Index: AQHTk/s1h7mUDZ7H3UmvjPnW2F0YiqOA3cmQ Date: Tue, 23 Jan 2018 04:31:41 +0000 Message-ID: References: <20180123033445.13468-1-bob.c.feng@intel.com> In-Reply-To: <20180123033445.13468-1-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: Fixed some small issues 1. The structure pcd default value should use the default value under sku. 2. Incorrect VpdOffset value for those un-used in module Vpd 3. Add a checkpoint for Structure Pcd Name 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: Tue, 23 Jan 2018 04:26:18 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Bob, Please use PatchCheck.py script to check the patch, current it will report = following error. The commit message format is not valid: * First line of commit message (subject line) is too long. Best Regards, Zhu Yonghong -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of BobC= F Sent: Tuesday, January 23, 2018 11:35 AM To: edk2-devel@lists.01.org Cc: Gao, Liming Subject: [edk2] [Patch] BaseTools: Fixed some small issues 1. The structure= pcd default value should use the default value under sku. 2. Incorrect Vpd= Offset value for those un-used in module Vpd 3. Add a checkpoint for Struct= ure Pcd Name Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bob Feng Cc: Liming Gao --- BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++-- BaseTools/Source/Python/Workspace/DscBuildData.py | 7 +++++-- BaseTools/Source/Python/Workspace/MetaFileParser.py | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 604d38a4d6..ce8bc64ca5 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1749,12 +1749,12 @@ class PlatformAutoGen(AutoGen): DefaultSku =3D DscPcdEntry.SkuInfoList.get('DE= FAULT') if DefaultSku: PcdValue =3D DefaultSku.DefaultValue if PcdValue not in SkuValueMap: SkuValueMap[PcdValue] =3D [] - VpdFile.Add(DscPcdEntry, 'DEFAULT',Sku= .VpdOffset) - SkuValueMap[PcdValue].append(Sku) + VpdFile.Add(DscPcdEntry, 'DEFAULT',Def= aultSku.VpdOffset) + =20 + SkuValueMap[PcdValue].append(DefaultSku) for (SkuName,Sku) in DscPcdEntry.SkuInfoList.i= tems(): Sku.VpdOffset =3D Sku.VpdOffset.strip()=20 =20 # Need to iterate DEC pcd information to g= et the value & datumtype for eachDec in self.PackageList: diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 60aa4868ed..6e4f8ac390 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1287,12 +1287,15 @@ class DscBuildData(PlatformBuildClassObject): CApp =3D CApp + ' UINT32 OriginalSize;\n' CApp =3D CApp + ' VOID *OriginalPcd;\n' CApp =3D CApp + ' %s *Pcd; // From %s Line %d \n' % (Pc= d.DatumType, Pcd.PkgPath, Pcd.PcdDefineLineNo) CApp =3D CApp + '\n' =20 - Pcd.DefaultValue =3D Pcd.DefaultValue.strip() - PcdDefaultValue =3D StringToArray(Pcd.DefaultValue) + if SkuName in Pcd.SkuInfoList: + DefaultValue =3D Pcd.SkuInfoList[SkuName].DefaultStoreDict= .get(DefaultStoreName,Pcd.SkuInfoList[SkuName].HiiDefaultValue) if Pcd.SkuI= nfoList[SkuName].HiiDefaultValue else Pcd.SkuInfoList[SkuName].DefaultValu= e + else: + DefaultValue =3D Pcd.DefaultValue + PcdDefaultValue =3D StringToArray(DefaultValue.strip()) =20 InitByteValue +=3D '%s.%s.%s.%s|%s|%s\n' % (SkuName, DefaultSt= oreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType, PcdDefault= Value) =20 # # Get current PCD value and size diff --git a/BaseTools/Source= /Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/Met= aFileParser.py index 7469cd7ab7..f404db7b7a 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1915,10 +1915,13 @@ class DecParser(MetaFileParser): PcdTockens =3D self._CurrentLine.split(TAB_VALUE_SPLIT) PcdNames =3D PcdTockens[0].split(TAB_SPLIT) if len(PcdNames) =3D=3D 2: self._CurrentStructurePcdName =3D "" else: + if self._CurrentStructurePcdName !=3D TAB_SPLIT.join(P= cdNames[:2]): + EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Nam= e does not match: %s and %s " % (self._CurrentStructurePcdName , TAB_SPLIT.= join(PcdNames[:2])), + File=3Dself.MetaFile,=20 + Line=3Dself._LineIndex + 1) self._ValueList[1] =3D TAB_SPLIT.join(PcdNames[2:]) self._ValueList[2] =3D PcdTockens[1] if not self._CurrentStructurePcdName: TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VALUE_S= PLIT, 1) self._ValueList[0:1] =3D GetSplitValueList(TokenList[0], TAB_S= PLIT) -- 2.14.3.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel