From nobody Tue Apr 30 20:54:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1520232969672163.68783894484056; Sun, 4 Mar 2018 22:56:09 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 724C921E08281; Sun, 4 Mar 2018 22:49:55 -0800 (PST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 639C32257C2DB for ; Sun, 4 Mar 2018 22:49:54 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Mar 2018 22:56:06 -0800 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by fmsmga005.fm.intel.com with ESMTP; 04 Mar 2018 22:56:05 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,426,1515484800"; d="scan'208";a="208836276" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Mon, 5 Mar 2018 14:56:02 +0800 Message-Id: <1520232962-6664-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [edk2] [Patch V2] BaseTools: Fix a bug that HII type pcd value display extra 0x00 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" V2: Add Pcd.DatumType check. Fix a bug that HII type Pcd value display in the report will have an extra 0x00, because original code use StringToArray function and it will judge whether the value length is a multiplier of 2, if not, it will change the value in Pcd Object and add an extra 0x00. Cc: Bob Feng Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Feng, Bob C =20 --- BaseTools/Source/Python/AutoGen/AutoGen.py | 7 ++++++- BaseTools/Source/Python/Workspace/DscBuildData.py | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 439e360..c8c042b 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1329,11 +1329,16 @@ class PlatformAutoGen(AutoGen): continue if len(Sku.VariableName) > 0: VariableGuidStructure =3D Sku.VariableGuidValue VariableGuid =3D GuidStructureStringToGuidString(Varia= bleGuidStructure) for StorageName in Sku.DefaultStoreDict: - VariableInfo.append_variable(var_info(Index,pcdnam= e,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.Va= riableOffset, Sku.VariableAttribute , Sku.HiiDefaultValue,Sku.DefaultStoreD= ict[StorageName],Pcd.DatumType)) + HiiValue =3D Sku.HiiDefaultValue + DefaultStoreVal=3D Sku.DefaultStoreDict[StorageNam= e] + if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TA= B_UINT32, TAB_UINT64, "BOOLEAN"]: + HiiValue =3D StringToArray(Sku.HiiDefaultValue) + DefaultStoreVal =3D StringToArray(Sku.DefaultS= toreDict[StorageName]) + VariableInfo.append_variable(var_info(Index,pcdnam= e,StorageName,SkuName, StringToArray(Sku.VariableName),VariableGuid, Sku.Va= riableOffset, Sku.VariableAttribute , HiiValue, DefaultStoreVal,Pcd.DatumTy= pe)) Index +=3D 1 return VariableInfo =20 def UpdateNVStoreMaxSize(self,OrgVpdFile): if self.VariableInfo: diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 9d78770..fc7a307 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -2513,17 +2513,13 @@ class DscBuildData(PlatformBuildClassObject): else: MaxSize =3D 0 if pcd.DatumType not in ['BOOLEAN','UINT8','UINT16','UINT32','= UINT64']: for (_, skuobj) in pcd.SkuInfoList.items(): datalen =3D 0 - skuobj.HiiDefaultValue =3D StringToArray(skuobj.HiiDef= aultValue) - datalen =3D len(skuobj.HiiDefaultValue.split(",")) + datalen =3D len((StringToArray(skuobj.HiiDefaultValue)= ).split(",")) if datalen > MaxSize: MaxSize =3D datalen - for defaultst in skuobj.DefaultStoreDict: - skuobj.DefaultStoreDict[defaultst] =3D StringToArr= ay(skuobj.DefaultStoreDict[defaultst]) - pcd.DefaultValue =3D StringToArray(pcd.DefaultValue) pcd.MaxDatumSize =3D str(MaxSize) rt, invalidhii =3D self.CheckVariableNameAssignment(Pcds) if not rt: invalidpcd =3D ",".join(invalidhii) EdkLogger.error('build', PCD_VARIABLE_INFO_ERROR, Message=3D'T= he same HII PCD must map to the same EFI variable for all SKUs', File=3Dsel= f.MetaFile, ExtraData=3Dinvalidpcd) --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel