From nobody Sun Apr 28 06:46:57 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+44791+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+44791+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564659511; cv=none; d=zoho.com; s=zohoarc; b=X3JEgbxAUbiDJ32QH7bqrBc1ITYjwDINDKX/0vfmilDPZU7lyEJk99gs67jm9MeQGXk25+tBH8FCIJh3AnxdCUsRbwZ+bno74/BNPZl7mRsl6ulk3McQDbKyxKN6OVwxRqaaTC7A1qKHOo8bpYC6yXMJkB/ePB5I+0R0YAUJmHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564659511; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=yB1yf4Sogs7iCXPpdVlY4ATetlIe1YvElBpNVamQamo=; b=FGgyg+Zh0EBgzcjnvUFXcAVeyRSWB8oK8KRtY7AnL42IefdFfc0Sp9fFPpcgDR5iFhTICw4lAGPHwcvr9rYLrsNNiHk7nIXO2EKYkAsyGAyIrkK09qTd+EE+jb2MT5Q6YjXPkOSmt0VatSk25sKdhISWOCVKH3pUBcytQuEs5M8= 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+44791+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 1564659511391556.7645444873833; Thu, 1 Aug 2019 04:38:31 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Thu, 01 Aug 2019 00:02:16 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2019 00:02:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,333,1559545200"; d="dat'59?scan'59,208,59";a="172819948" X-Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga008.fm.intel.com with ESMTP; 01 Aug 2019 00:02:07 -0700 X-Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 1 Aug 2019 00:02:07 -0700 X-Received: from bgsmsx154.gar.corp.intel.com (10.224.48.47) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 1 Aug 2019 00:02:07 -0700 X-Received: from bgsmsx105.gar.corp.intel.com ([169.254.3.133]) by BGSMSX154.gar.corp.intel.com ([169.254.7.20]) with mapi id 14.03.0439.000; Thu, 1 Aug 2019 12:32:05 +0530 From: "Cheng, Ching JenX" To: "devel@edk2.groups.io" CC: "Chan, Amy" , "Chiu, Chasel" , "Desimone, Nathaniel L" , "Zeng, Star" Subject: [edk2-devel] [PATCH] * IntelFsp2Pkg: Improve FSP Python scripts to support 3.x. Thread-Topic: [PATCH] * IntelFsp2Pkg: Improve FSP Python scripts to support 3.x. Thread-Index: AdVINwYctnADMCfmS3ay22g2Z+P6Bw== Date: Thu, 1 Aug 2019 07:02:05 +0000 Message-ID: <41C441B9D06FFF49AD23ED447CFBE8B15F3414@BGSMSX105.gar.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <41C441B9D06FFF49AD23ED447CFBE8B15F3414@BGSMSX105.gar.corp.intel.com> x-originating-ip: [10.223.10.10] 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,ching.jenx.cheng@intel.com Content-Type: multipart/mixed; boundary="_000_41C441B9D06FFF49AD23ED447CFBE8B15F3414BGSMSX105garcorpi_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564659511; bh=Fle1y8NboeXE8wuMYfGcpQEJB4AHItbq/BU2hI6vxkc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=oYBiRjBexrvNQURPVyoGfySS+wDAsV4azbBNRt3ihVHxXlma1NT6jnjmlwiF9iaCwy2 Qy+TWWmmRhbYdNBd6pYbBlVqGE34uGS9iPgv4LwFMBD4fHYpkY9f1XrdLuKRmT1kvVFgR DZ5aTogU8PZoDyGwkW+oI6ABrqnd9RPTWLI= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_41C441B9D06FFF49AD23ED447CFBE8B15F3414BGSMSX105garcorpi_ 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=3D2041 Improve Python3.x support with IntelFsp2Pkg/Tools/GenCfgOpt.py, Base on <<, print('%x' % ) is only support for int, not float. Cc: Amy Chan Cc: Chasel Chiu Cc: Nate DeSimone Cc: Star Zeng Signed-off-by: Ching JenX Cheng --- IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt= .py index a42717caae..2fa7582d85 100644 --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py @@ -715,7 +715,7 @@ EndList if (ConfigDict['embed'].find(':END') !=3D -1): Remainder =3D Offset % (MaxAlign/8) # MaxAli= gn is either 32 or 64 if Remainder: - Diff =3D (MaxAlign/8) - Remainder + Diff =3D int((MaxAlign/8) - Remainder) Offset =3D Offset + Diff ItemOffset =3D ItemOffset + Diff MaxAlign =3D 32 # Reset = to default 32 align when struct end @@ -727,7 +727,7 @@ EndList Remainder =3D Offset % max(ItemLength/8, 4, Si= zeAlign) Offset =3D Offset + ItemLength if Remainder: - Diff =3D max(ItemLength/8, 4, SizeAlign) -= Remainder + Diff =3D int(max(ItemLength/8, 4, SizeAlig= n) - Remainder) ItemOffset =3D ItemOffset + Diff ConfigDict['offset'] =3D ItemOffset =20 @@ -1416,7 +1416,7 @@ EndList if BitsRemain: BsfFd.write(" Skip %d bits\n" % BitsRem= ain) BitsGap -=3D BitsRemain - BytesRemain =3D BitsGap / 8 + BytesRemain =3D int(BitsGap / 8) if BytesRemain: BsfFd.write(" Skip %d bytes\n" % BytesR= emain) NextOffset =3D Item['offset'] + Item['length'] --=20 2.21.0.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 (#44791): https://edk2.groups.io/g/devel/message/44791 Mute This Topic: https://groups.io/mt/32677000/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_41C441B9D06FFF49AD23ED447CFBE8B15F3414BGSMSX105garcorpi_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IuU9AQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADFBRkJBOUI4 ODlCQTM2NDFBMTVDMjYwMDBGN0E3NDU2ACYHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHCAABAAcA AgAFAAQABQEBIIADAA4AAADjBwgAAQAHAAIABQAEAAUBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEMAAABbUEFUQ0hdICogSW50ZWxGc3AyUGtnOiBJbXByb3ZlIEZTUCBQ eXRob24gc2NyaXB0cyB0byBzdXBwb3J0IDMueC4AgRYBC4ABACEAAAAxQUZCQTlCODg5QkEzNjQx QTE1QzI2MDAwRjdBNzQ1NgAmBwEDkAYAeA4AAC8AAAACAX8AAQAAAEYAAAA8NDFDNDQxQjlEMDZG RkY0OUFEMjNFRDQ0N0NGQkU4QjE1RjM0MTRAQkdTTVNYMTA1Lmdhci5jb3JwLmludGVsLmNvbT4A AAALAB8OAQAAAAIBCRABAAAAEQUAAA0FAACECwAATFpGdZsz8FRhAApmYmlkBAAAY2PAcGcxMjUy AP4DQ/B0ZXh0AfcCpAPjAgAEY2gKwHNldDAg7wdtAoMAUBFNMgqABrQCgJZ9CoAIyDsJYjE5DsC/ CcMWcgoyFnECgBViKgmwcwnwBJBhdAWyDlADYHOibwGAIEV4EcFuGDBdBlJ2BJAXtgIQcgDAdH0I UG4aMRAgBcAFoBtkZJogA1IgECIXslx2CJDkd2sLgGQ1HVME8AdADRdwMApxF/Jia21rBnMBkAAg IEJNX0LgRUdJTn0K/AHxC/ERH7BaOmgCQHBzOsAvL2J1Z3oDEAtgJC50BzBubwWhZS4BBbBnL3No b3dfQSJRLmNnaT8N0D3VAdA0AFBsC4BlCoElFBhJbXADYBowIFB5AnQj0G4zLnggc2h1cHAJESAD 8CaAIAJJAjBlbEZzcDIkUGsjoFRvBvBzL0JHCfBDZmdPBTAuSHB5LCUFQmESACDBAiAgPDwsICYA C4AAdCgnJXgnICWYICkgBAAqgWx5Jvf/GuEr4AIwKuAjECzRCQAYgAIuJQxDYzogQW3tLFBDGaEq sGEvUCRAGaHeQCshKAAkQANwPi6ZL4HnEgADIC+AaXUqsBHBMfFvMBEyUDBvLvNOGIAZ4EScZVMH cAIgGeA8bhiA/xmhCJAzkDOQAQAAkDUyM0+lLvNTH3EgWgnwZyqwOR9iLno4kTbfFMBpZwkYUGQt GTBmLWJ51zGiC4A4sEoJ8FgvcTiT0zMBGcAuagnweDAROU89JTItPsAlBSfPKN0gfLAgNiArQbA+ yTEccNcDEBngGZRkKuAzLSESAIUAIGkCIHMoKylDcucBAB5wRAQtKSUMDeABIM4gPsAkYAVAYS8/ f0CNfmJHLyjdJQUdsRAwRwA0UDI3MTceUGEjYC4AMmZhNzU4MmSMODVCgB6gNjQ0Plh/Rw9KPyUF QbFJL0+fJQVAxkBGoExANSw3QaBUFNVT0UUdwEwEAHQ+9lX/M1Z1BpAgKBtBQrBnRGEOUHRbJ2UG 0AmAJxxdLkKwHcArUDpFTiREJyvQIT1GoDEp7jpVj1tPW3BSWIALcQSBOiBZ4E8BIBIBK6EoTZhh eEElEDqwLzgr0N1bcCMF0F31K+JlJ5EbsfwzMiqABcBNsFpPYZ9XY/9ch1o2TnBkL2UcWCBGgVng /13bTnBch1CmZR9lP2ZDKyL/Zp9cpUV2aY9uTl1FXSdRMK9mImzfcb9yJEkQIG1vV/9zOXBfdb92 Rl7nWeBgEXgvf3iDXsBcgF1yGJBEsUzgdd5sBUBgEQdAXzJ3PEEm8Ph0cnVYQF+QHcBTakwwf1RD fQNU73iPW89c3gDAeHooczJMOJEmgF5gKuA0/yrgNRA5MF4TbM+E328vdJL/gjiD74jvYr9jz4wf ZemB//+DDGdfaG+R72qKje+O/2w//5IPcj9zT3Rflt+b2FfKOwFfEgFY0JmrPvZTaTEk4DZfVEKg JX3Pm99XCUInkHMPgKRaP6WPpcFCc2ZGmGQudwUQECAoIqXGelMdoHAroBxgDcCkAFz8XG6nkCuw o+iWf6r/pqLpo/FHYahQLVngo+iK/z+l7iZwB5CApF0RrEYvIP44kJ+ur6+6KyKwean/or//o8Gv qKSPuO+mr6e+r6Ko5v+vqLT/vjoHwBBAmUudiYckv1hgHnCUYljQPlefZjJMwDgxLjC6gB2xI+Bz Lgck/RVCxTAAAAAfAEIAAQAAACQAAABDAGgAZQBuAGcALAAgAEMAaABpAG4AZwAgAEoAZQBuAFgA AAAfAGUAAQAAADYAAABjAGgAaQBuAGcALgBqAGUAbgB4AC4AYwBoAGUAbgBnAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBUAFAAAAAAAAIBQQABAAAAfAAAAAAAAACBKx+k vqMQGZ1uAN0BD1QCAAAAgEMAaABlAG4AZwAsACAAQwBoAGkAbgBnACAASgBlAG4AWAAAAFMATQBU AFAAAABjAGgAaQBuAGcALgBqAGUAbgB4AC4AYwBoAGUAbgBnAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAfAAJdAQAAADYAAABjAGgAaQBuAGcALgBqAGUAbgB4AC4AYwBoAGUAbgBnAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAAAB8A5V8BAAAAPgAAAHMAaQBwADoAYwBoAGkAbgBnAC4AagBlAG4AeAAuAGMA aABlAG4AZwBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfABoMAQAAACQAAABDAGgAZQBuAGcALAAg AEMAaABpAG4AZwAgAEoAZQBuAFgAAAAfAB8MAQAAADYAAABjAGgAaQBuAGcALgBqAGUAbgB4AC4A YwBoAGUAbgBnAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAAAFMATQBUAFAAAAAA AAIBGQwBAAAAfAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEMAaABlAG4AZwAsACAAQwBoAGkA bgBnACAASgBlAG4AWAAAAFMATQBUAFAAAABjAGgAaQBuAGcALgBqAGUAbgB4AC4AYwBoAGUAbgBn AEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAFdAQAAADYAAABjAGgAaQBuAGcALgBqAGUAbgB4AC4A YwBoAGUAbgBnAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8A+D8BAAAAJAAAAEMAaABlAG4AZwAs ACAAQwBoAGkAbgBnACAASgBlAG4AWAAAAB8AI0ABAAAANgAAAGMAaABpAG4AZwAuAGoAZQBuAHgA LgBjAGgAZQBuAGcAQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAAUwBNAFQAUAAA AAAAAgH5PwEAAAB8AAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACAQwBoAGUAbgBnACwAIABDAGgA aQBuAGcAIABKAGUAbgBYAAAAUwBNAFQAUAAAAGMAaABpAG4AZwAuAGoAZQBuAHgALgBjAGgAZQBu AGcAQABpAG4AdABlAGwALgBjAG8AbQAAAB8ACV0BAAAANgAAAGMAaABpAG4AZwAuAGoAZQBuAHgA LgBjAGgAZQBuAGcAQABpAG4AdABlAGwALgBjAG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIAAABJ AFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAACwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAAABr7 qbiJujZBoVwmAA96dFYDABcAAQAAAEAAOQCAlLEGN0jVAUAACDCdKrcGN0jVAR8AAICGAwIAAAAA AMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAAdABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAMAAAA ZQBuAC0AVQBTAAAAHwA3AAEAAACGAAAAWwBQAEEAVABDAEgAXQAgACoAIABJAG4AdABlAGwARgBz AHAAMgBQAGsAZwA6ACAASQBtAHAAcgBvAHYAZQAgAEYAUwBQACAAUAB5AHQAaABvAG4AIABzAGMA cgBpAHAAdABzACAAdABvACAAcwB1AHAAcABvAHIAdAAgADMALgB4AC4AAAAAAB8APQABAAAAAgAA AAAAAAADADYAAAAAAAIBcQABAAAAFgAAAAHVSDcGHLZwAzAn5kt2sttoNmfj+gcAAB8AcAABAAAA hgAAAFsAUABBAFQAQwBIAF0AIAAqACAASQBuAHQAZQBsAEYAcwBwADIAUABrAGcAOgAgAEkAbQBw AHIAbwB2AGUAIABGAFMAUAAgAFAAeQB0AGgAbwBuACAAcwBjAHIAaQBwAHQAcwAgAHQAbwAgAHMA dQBwAHAAbwByAHQAIAAzAC4AeAAuAAAAAAAfADUQAQAAAIwAAAA8ADQAMQBDADQANAAxAEIAOQBE ADAANgBGAEYARgA0ADkAQQBEADIAMwBFAEQANAA0ADcAQwBGAEIARQA4AEIAMQA1AEYAMwA0ADEA NABAAEIARwBTAE0AUwBYADEAMAA1AC4AZwBhAHIALgBjAG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBv AG0APgAAAAMA3j+fTgAAQAAHMKTilwY3SNUBAgELAAEAAAAQAAAAGvupuIm6NkGhXCYAD3p0VgMA JgAAAAAAAgFHAAEAAAAyAAAAYz1VUzthPU1DSTtwPUludGVsO2w9QkdTTVNYMTA1LTE5MDgwMTA3 MDIwNVotMzgyOAAAAAIBEDABAAAARgAAAAAAAAC9vyQ4UfLmSZlPuqxeFB3EBwBBxEG50G//Sa0j 7UR8++ixAAAAXFKeAACR92GG725yRp0lh8JqYMNaAClFIwIpAAAAAB8A+j8BAAAAJAAAAEMAaABl AG4AZwAsACAAQwBoAGkAbgBnACAASgBlAG4AWAAAAAMACVkBAAAACwAAgAggBgAAAAAAwAAAAAAA AEYAAAAAgoUAAAAAAAADAA00/T8AAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACAAAAB4AC0AbQBz AC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAACAAAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABG AQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkAbgBnAC0AaQBwAAAAAAABAAAAHgAAAFsAMQAw AC4AMgAyADMALgAxADAALgAxADAAXQAAAAAAP1k= --_000_41C441B9D06FFF49AD23ED447CFBE8B15F3414BGSMSX105garcorpi_--