From nobody Tue Apr 30 23:48:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47474+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47474+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1568799816; cv=none; d=zoho.com; s=zohoarc; b=aAJk5J7gAlJ1LYV4Yj6upUwjK4HiZ96YOStTKa9+MSpgQYzUGGcgvTXvjkfX60YAI9fjXIE+DfG8y3fvqZbmETz7russCPb9KWJR6z+0JlHJSSrs+ZsTplhpRjx7vQaMip55YW3JyGZXJvCp5BiazN85Jbv95bN+Z6+zVE/Did0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568799816; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=PnhmPeszuPzfssAd3AuUU8V8P/6PMuHli9aFaUGCkYM=; b=FqQhJwuW0pfvKg+9jRgACHFfgl31GkO512W0HfjTqxyUe5057zqHZRprcoeexe7dXhLhLygNP9Y0RW0FJz9TGOQzM5djiD/Vhp0g7x57kagKlFmwdJ7dx1OgLLWIEJ2CNg1sKlkv6lxs5r5w86b9O3RC04HaaczWsLfxcBytkDk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47474+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1568799816111175.7379176605192; Wed, 18 Sep 2019 02:43:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6kplYY1788612xE6NU2TRj3C; Wed, 18 Sep 2019 02:43:35 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Wed, 18 Sep 2019 02:43:35 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Sep 2019 02:43:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,520,1559545200"; d="dat'59?scan'59,208,59";a="191668846" X-Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga006.jf.intel.com with ESMTP; 18 Sep 2019 02:43:33 -0700 X-Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 18 Sep 2019 02:43:33 -0700 X-Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 18 Sep 2019 02:43:32 -0700 X-Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 18 Sep 2019 02:43:32 -0700 X-Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.92]) by shsmsx102.ccr.corp.intel.com ([169.254.2.113]) with mapi id 14.03.0439.000; Wed, 18 Sep 2019 17:43:30 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH] BaseTools:Change the way that get some VpdPcd information Thread-Topic: [PATCH] BaseTools:Change the way that get some VpdPcd information Thread-Index: AdVuBYXcIIUjTKvDS9COF4MjDC1lMA== Date: Wed, 18 Sep 2019 09:43:29 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com X-Gm-Message-State: XgBf2ZM5p7rkNtKCVqupM7Aqx1787277AA= Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBD84BSHSMSX101ccrcor_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1568799815; bh=jUkH7kLr6L0T+pPi5DjK+qbPudqj1McQiWpGMhjM9n4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=I7XmqUXwKvF0ln54MQcecF64YL8M+BKvkUb3Q3MJq8hbwf2nJL7/7v/BljT/WVr+Blw fVHcZZsgUBnojUWynIeKyqa5AbGB0DvBWM+/VE9OYxCcDI1Q96PvqReqcnLwlE1w1cn1p YXMHF3PPbOEuzWSSZcqOQFzRbXaAvV5mIU4= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBD84BSHSMSX101ccrcor_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2201 An error occurs using special VpdPcd that is not used in the Inf file In dsc: [PcdsDynamicExVpd.common.DEFAULT] gBoardModuleTokenSpaceGuid.test1|*|{CODE({ {0x0} // terminator })} In dec: [PcdsDynamicEx] # Vpd GPIO table gBoardModuleTokenSpaceGuid.test1|{0}|GPIO_INIT_CONFIG[]|0x50000018 { Library/GpioLib.h MdePkg/MdePkg.dec } ValueError: invalid literal for int() with base 0: '*' This Patch is going to fix issue by Change the way that get some VpdPcd information Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan Reviewed-by: Bob Feng --- BaseTools/Source/Python/build/BuildReport.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index 6b26f1c3b0..880459d367 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1419,10 +1419,19 @@ class PcdReport(object): FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.= VpdOffset)) VPDPcdItem =3D (Pcd.TokenSpaceGuidCName + '.' + Pc= dTokenCName, SkuIdName, SkuInfo.VpdOffset, Pcd.MaxDatumSize, SkuInfo.Defaul= tValue) if VPDPcdItem not in VPDPcdList: - VPDPcdList.append(VPDPcdItem) + PcdGuidList =3D self.UnusedPcds.get(Pcd.TokenS= paceGuidCName) + if PcdGuidList: + PcdList =3D PcdGuidList.get(Pcd.Type) + if not PcdList: + VPDPcdList.append(VPDPcdItem) + for VpdPcd in PcdList: + if PcdTokenCName =3D=3D VpdPcd.TokenCN= ame: + break + else: + VPDPcdList.append(VPDPcdItem) if IsStructure: FiledOverrideFlag =3D False - OverrideValues =3D Pcd.SkuOverrideValues[Sku] + OverrideValues =3D Pcd.SkuOverrideValues.get(Sku) if OverrideValues: Keys =3D list(OverrideValues.keys()) OverrideFieldStruct =3D self.OverrideFieldValu= e(Pcd, OverrideValues[Keys[0]]) --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47474): https://edk2.groups.io/g/devel/message/47474 Mute This Topic: https://groups.io/mt/34186106/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBD84BSHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IuQzAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADQ3MjFCMTJF MzhEMDMyNDBCRDlCQzQ1NTRGRDk5OUY3ACgHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHCQASAAkA KwAdAAMAWQEBIIADAA4AAADjBwkAEgAJACsAHQADAFkBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEIAAABbUEFUQ0hdIEJhc2VUb29sczpDaGFuZ2UgdGhlIHdheSB0aGF0 IGdldCBzb21lIFZwZFBjZCBpbmZvcm1hdGlvbgBSFwELgAEAIQAAADQ3MjFCMTJFMzhEMDMyNDBC RDlCQzQ1NTRGRDk5OUY3ACgHAQOQBgDgDwAAMwAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFFMEZB NTREOTg3RjZFNzI0MzVDQUZENTBBRkJEODRCQFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5jb20+ AAsAHw4BAAAAAgEJEAEAAAAqBgAAJgYAAKMMAABMWkZ1Yw+kuWEACmZiaWQEAABjY8BwZzEyNTIA /gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkOwL8J wxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0fQhQ bhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQACAg Qk1fQuBFR0lOfQr8AfEL8REfsFo6aAJAcHM6wC8vYnVnegMQC2AkLnQHMG5vBaFlLgEFsGcvc2hv d19BIlEuY2dpPw3QPdYyAdAAUGwLgGUKgSUUvkEDoASQA2AFwCMgYwhwjQQgdQCQGcAgc3AFkIEH MSBWcGRQYxxg7nQR0AVABAAgIxAFQCbgjxxRC4AoIRngSW5mHHBNAxBlJQwpsCBkBPA6BSUFWyfx c0R5bmF+bQ5QGXAnwSRAA3AEYG4ALkRFRkFVTFSiXSUFZ0JvCxFNBHCidR5wVG9rCfBTCrBwY2VH dQ3QItAHkHQAMXwqfFx7Q08tLYAoMKAlBSADMHsw+ngBQH0xoCIwHMEbAAuA8xiCJQZ9KTIQKj8F gSt/CyyDLfYjJ7IgR1BJ/k8cwAGgKhcxoC5/L44xwRUyEHw3Yl8gIElUXwEwwE5GSUdbXXzNMeA1 HqA8YTE4MbExN1A8SGVhBIFGKgFzRj4xNzGgTGliGHByQHkvR3Bpbz8RLspoPQhQANBrYRgwPkuy TQEAUGsjoEIELgWBWzMnJQVWB0AKUEUmIjrtKTF2B0AN0CAlEBuhJ5HDGuEpMXQoKSAD8CgwSCBi YRIAIDBEsCdkKiclDFRoKIFAwHRzEcAocmdvJwIYkCnheI0ocXMKUEaweSBDGaS5KXJ3YUpwKDMY MHQlBf8ZIAeAJ7YLgBrkP7ALkCUbnkM1ED8BMrEnIEdhSaCmPCUQTyIuZ0+AQEYRPGVsLQI+Vk7C OKBiIDZGCfAnIDwG4D/wYy5OZlIRUG8UwGlnGFBksi0ZMGYtSmBEsFpIYJBqdS5GA5E8elUiznhS sABwUw8KLVeAMTaOQkbROVAG8HMvUwhh8S+wL1B5KDACICJBAxCIZC9CWcJSZXAJEQQucEpwfCAx MyB2K1tYV5gxKeMb0BmjZH4sWxBcoAuAEgAAIE2xc+goKyldgDI04R5wXiTeLTOwJRsN4AEgIFeA JGC9BUBhWgBYT1lfWmhiYU8fYl9aSSUFHbEQMCA2YgQyNgBAYzNiMC4ALjg4MDQ1OWQYMzY3WxAe oDY0NP9XGGEvZS9mPyVBW1FkH2tfk2xvJUFAQGDAMTQWcE4sHpBbQHF0OSBxMWOvC2AEESfxWmQo UdBqBZB8dCk1Jj7SdN8+0j4CVxsFEBAgKD4CXYAnJSpAcycgJSAoEgBswGYuTWF4TAnwW0BEIDRd gFNrdSmxb9ouJ8FPASASASlflnUv0Xr2VlBEJ/FJECAcsJY9d6An8S45XENOLHDzGeBtwCcud3Bt wCfxOVP7fgN4tGR/eHkbXYB84ngRUkQYgHVtVCB6gFlE9QEQYTkgdEQTef+FHgaQ/3v6KLIpQXwE PxAfYDUmajDHiK97bofSLmFwJ1AdwP4ofAhflm3AjL+NaCfxL9Lnh9J8oXfDVW4o8iwCUCD/EhB8 333ljC+TD4X0jnk1Jr+Sj41/h7R8oY55kEh5J1D/kg+a74W4KLKHrZpvnt+KP/+LT52Pox8+0kXS TMec36Nv/6dflDZ/GHygfLAnxJDEfgPfpc+r76ztPzA9sGuq/69P/6+0UKASAKrvsg+ff6CPoZsD ss+F5UlzU3Rydf9z8AhwsPe2X3W6eXAaMQUQ/QEARgtgJyB8sFVwsNGIL9+83bqmRBMEIJhDLoCB vez+W4CBLfaxj71vvn/CupBD/4CBtZ+2bynQwpy4T8mfPtG4S2V5w2IlEB9gKMQd/zlwywBGQMV/ zf/CaT4AUKD+ZLe0jybPS0QTkIJdgL9t4criWzBdXV+WaiElBewyLnFw1RAuA/AdwCPgD5AwJP0V QtcgAAAfAEIAAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6AGgA aQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBU AFAAAAAAAAIBQQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgA aQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBv AG0AAAAfAAJdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAAAB8A5V8BAAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAAAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAAACoA AAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAA AFMATQBUAFAAAAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwA IABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAAAB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAAKgAA AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAA UwBNAFQAUAAAAAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAg AFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwA LgBjAG8AbQAAAB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBj AG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAA CwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAAAEchsS440DJAvZvEVU/ZmfcDABcAAQAAAEAAOQCA tqKGBW7VAUAACDDZlCGHBW7VAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAA dABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAACEAAAAWwBQ AEEAVABDAEgAXQAgAEIAYQBzAGUAVABvAG8AbABzADoAQwBoAGEAbgBnAGUAIAB0AGgAZQAgAHcA YQB5ACAAdABoAGEAdAAgAGcAZQB0ACAAcwBvAG0AZQAgAFYAcABkAFAAYwBkACAAaQBuAGYAbwBy AG0AYQB0AGkAbwBuAAAAHwA9AAEAAAACAAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdVuBYXc IIUjTKvDS9COF4MjDC1lMAAAHwBwAAEAAACEAAAAWwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABv AG8AbABzADoAQwBoAGEAbgBnAGUAIAB0AGgAZQAgAHcAYQB5ACAAdABoAGEAdAAgAGcAZQB0ACAA cwBvAG0AZQAgAFYAcABkAFAAYwBkACAAaQBuAGYAbwByAG0AYQB0AGkAbwBuAAAAHwA1EAEAAACQ AAAAPABGAEEARAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0ADMA NQBDAEEARgBEADUAMABBAEYAQgBEADgANABCAEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMAcgAu AGMAbwByAHAALgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcws3AahwVu1QECAQsA AQAAABAAAABHIbEuONAyQL2bxFVP2Zn3AwAmAAAAAAACAUcAAQAAADMAAABjPVVTO2E9TUNJO3A9 SW50ZWw7bD1TSFNNU1gxMDEtMTkwOTE4MDk0MzI5Wi0xMzg3OQAAAgEQMAEAAABGAAAAAAAAACZ3 vTk77DhJpKYVPcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60eaTGQA AAlUwAsAAAAAHwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABAAACA CCAGAAAAAADAAAAAAAAARgAAAAC/hQAA4FDghQVu1QELAACACCAGAAAAAADAAAAAAAAARgAAAACC hQAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQA AAABAAAAGgAAAGQAbABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAA RgEAAAAYAAAAZABsAHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABIAAAAxADEALgAyAC4AMAAuADYA AAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABoAAABkAGwAcAAtAHIAZQBhAGMAdABpAG8AbgAA AAAAAQAAABQAAABuAG8ALQBhAGMAdABpAG8AbgAAAAMADTT9PwAAHwAAgIYDAgAAAAAAwAAAAAAA AEYBAAAAIAAAAHgALQBtAHMALQBoAGEAcwAtAGEAdAB0AGEAYwBoAAAAAQAAAAIAAAAAAAAAHwAA gIYDAgAAAAAAwAAAAAAAAEYBAAAAIgAAAHgALQBvAHIAaQBnAGkAbgBhAHQAaQBuAGcALQBpAHAA AAAAAAEAAAAgAAAAWwAxADAALgAyADMAOQAuADEAMgA3AC4ANAAwAF0AAAAZug== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBD84BSHSMSX101ccrcor_--