From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.5904.1605771003456552003 for ; Wed, 18 Nov 2020 23:30:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=BaHR+qDF; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: bob.c.feng@intel.com) IronPort-SDR: Kx74MTauB6suoDhOc4Mpz1XVBAiZHpE0cZ9WgcmEClf8DNq1X6wnPqhJLhKPHe/qRlZajWz4TC ahsY+Ww6xdqw== X-IronPort-AV: E=McAfee;i="6000,8403,9809"; a="189332007" X-IronPort-AV: E=Sophos;i="5.77,489,1596524400"; d="scan'208";a="189332007" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2020 23:30:02 -0800 IronPort-SDR: 6EyKvFs2A8payzrXVLBMJnoisZTXGCX0rwSX6FMi4UNzRA5I1cOREjl1VZNQ/hOi4NNGVsE6or 2y76heYmHIbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,489,1596524400"; d="scan'208";a="534659366" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga005.fm.intel.com with ESMTP; 18 Nov 2020 23:30:02 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 18 Nov 2020 23:30:01 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 18 Nov 2020 23:30:01 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 18 Nov 2020 23:30:01 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.104) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 18 Nov 2020 23:29:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NdcT73fnjWtLXEgqvmdE1HzTJRFavNfGzkOmljRan58bNR9F1J9fRiB/+EV1TmxaHK91QoKV5ZEB062y8tlV9Y6sHEy39Orma+Q9YFaD6GhnBF5mBeaU93SfZJdGeS/5UWZl/Ia+bV5PFY7PdfDGylR7nNHe/i2esJRJCetYX2Bi5l/JsRbXBLdQSWZUarAC/h1ZXjg5k8HF8+78Dg/Ac51VxYVHhUSSe12/nGc1b0crdQtkGIL/5V+VwZEGzrgR2ID9Utg0BJs+kwG7UDWCZl3SrD+sGz+phfdctuORAAhNvwtq5KWp6U3SIwhlS97z3WGV44dsLSkyGN2Vw+/9ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OhVo1BuQyHeZ5wmgDxsf2v2AoURUm6NZfKefE3MQTGQ=; b=IezG1FdU4qpz13zQ8/FKdc0J93i5O+dgX9JboKmkCI3fTwaywJeSbJpRxJ/prr8FuBi+veE13mWdCYfn2hVr6mtzeJT17j9PmDfwcXWDCcLRlnDV3edOR0Y24qR0C6ZKE9YCDDN+Vbg3u1GtfVgjiq1LQEj2Fmh6dSiUIN5SA1U94X9/lwoJ9XtpND2QOmR3KvuqWn4iY7H2F2xBj7xoD5d4vvoZvsR/sToba8Sti7XwaeQJI3h2M3VOPyIQdLyE5yFfAw5/dWXEURZaUX3MUyJhvxeECzNagle8pfQrcHN9PQhrHIt/L9o1LBUp1oOoRCFyoci+t1uBveJufd4FhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OhVo1BuQyHeZ5wmgDxsf2v2AoURUm6NZfKefE3MQTGQ=; b=BaHR+qDFeIKc54mnTTzGYE9rJFrXNn60TgeBHQCua8VqsfOW3849BUadmzYedZbwSOgAUworzhEKHRk+yht76zNIYIRQWHHshqaAo2npDM0cUId/OhSyEA+RbWIv04VJI4GmKLM8JTIFp1EIIHLsk4ktH2bqKy9T5nyQUGIQ/Xc= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB4347.namprd11.prod.outlook.com (2603:10b6:5:200::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20; Thu, 19 Nov 2020 07:29:56 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb%3]) with mapi id 15.20.3589.020; Thu, 19 Nov 2020 07:29:56 +0000 From: "Bob Feng" To: "Chiu, Chasel" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Zeng, Star" , Yunhua Feng , "Liu, Zhiguang" Subject: Re: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Thread-Topic: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Thread-Index: AQHWvjyhteKbriiRWUGlNqPwyePLU6nPDv+Q Date: Thu, 19 Nov 2020 07:29:56 +0000 Message-ID: References: <20201116022422.1597-1-bob.c.feng@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.39] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 900511fe-e484-465a-efe2-08d88c5cea12 x-ms-traffictypediagnostic: DM6PR11MB4347: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:46; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: eTj0CHsfSUhIZzlSkA1pPERI6N/0p4NYPjU6D93OBAjLWz+TZfpZR5L0CsyThcfSkgzfUkyO2OO71+FGYtxnfPaH6NrsmHwsp04hUN5dZWrrD1z8dxjDMyPk/FNjwJTtsK5cIdWDieL3YP+3uDs7DzbDbKoQm3+PmFrpScjhBqWUsSlFyze99xsU36d6Zje1aYt+UoAGsToMKYAO+vQlMguD+TWjlcEjgXxFUPHWm4kkvo7Rf3p1rD9OTfBWc/fIEQcMaObyWv74sBWOeC0VjKWifK1xJCpjhNZ3qvoMY0uOb8COL/0fILlcUuxvVGOu8zJeqts64sNobTuyv20bUaA2AO3pb2KC46zsQ46VHQZYjCN0PEMI6BsG5DRASxpcd0hEMcrALm3s++VCF6oJ8g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(136003)(346002)(366004)(376002)(39860400002)(478600001)(966005)(316002)(7696005)(5660300002)(2906002)(53546011)(110136005)(26005)(107886003)(76116006)(33656002)(66556008)(54906003)(4326008)(52536014)(66476007)(66446008)(19627235002)(64756008)(66946007)(186003)(71200400001)(8676002)(86362001)(9686003)(55016002)(83380400001)(8936002)(6506007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: PEjbOdixfum/QKxSlTDZh4H/FVZfzYe/afmCtMHhCTrzSs7t0feo2fApMabWgdMvaNoW0+Dg6SlPlw64feGGvqsv7N637CWDhHV+Ah716YeY8lp0ykPqiX2jVyfK9reM5h+NsJgFxO6M7C9Q9sl6UjCea8yRRtlDA7uQSvHoSpKM2nXzYmnR1ExGzkwZI0bFpHNhmV8kHTcSWjLEyfvLWgxfkEpDIX8RfMQrs0asf9tTt2JrCncpYuJaqimpPpGPxUsCVfcP6n0x/7pRNSILFolVivMgrZS+ewgZCCiREYtSGkRNm83CaZ/3doA9DVFtro7PZGzi7jgoGTQZHbaL/c6zPX9yUq6yvcONIf56m6gwgu2JigoqwrT9wysqpAG62MFA1/FqJ1EejGSXKsGzvk7cyeeYTZN+ehWpyd5WmN1lntUKGAOz5Uu334Aun8SfZwK9qEpfL9oJdOQbFoirwNu2aaZ86Kk+mr6XLHb+wG/UvU+lwiUokhgJxKnXIw6FFHcfhB3Q7iVLaePIiAGDcPbfMjY6PvqAxgwPuNpUJ02BY8RxUITO3CKgfj3v4Fhhhpn2F1jlP7hcfJacsdA0noxEfxOeoSP0DNXZ0knijelcnE0tBDZpJbPd9hJtGYNAPmZ/IwL7qRhAoHHWFz3SuVTbDAjzB+5oplJ6P42Cn7/04kth4yHJvJKJc9zFgScBiYmPUogLYUMe6RSefot27t/KANp55kcFHqnVuG7mikJoAZT5hVMqkYpB0/0bOc9/Mgree4MGAWaSx16Wr9G+2TJSyaKvIlvPJjPFaFWPUYGUpmMB6Hu4uPHsq0EGyaqhS1BlX9o7FU/P0bbQ7yQRVac6M+pLvin/RDlbNB1QQyM9K7z9NVp75kf1xCyKObpHqXT0moh0bTlmFW2X1TrpAw== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 900511fe-e484-465a-efe2-08d88c5cea12 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Nov 2020 07:29:56.3085 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ItWE+do8oWSxAKe1c+8mH+SCag2ilAlwXpj4wGA+JBts2FBiw53ysYH2RWHNxiSJl0YR/dnMBROGA2/G9agVoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4347 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I created a PR. https://github.com/tianocore/edk2/pull/1135 -----Original Message----- From: Chiu, Chasel =20 Sent: Thursday, November 19, 2020 2:24 PM To: devel@edk2.groups.io; Feng, Bob C Cc: Desimone, Nathaniel L ; Zeng, Star ; Yunhua Feng ; Liu, Zhiguang <= zhiguang.liu@intel.com> Subject: RE: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py t= o parse new Fv map file format Reviewed-by: Chasel Chiu > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob=20 > Feng > Sent: Monday, November 16, 2020 10:24 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L=20 > ; Zeng, Star ;=20 > Yunhua Feng ; Liu, Zhiguang=20 > > Subject: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py=20 > to parse new Fv map file format >=20 > The commit 76e8aac158b0717fa27f12e4d008f79161ddb050 changed Fv map=20 > format. > It added the image type to better support source level debug. But it=20 > broke the function of PatchFv.py because PatchFv.py also consume Fv map f= ile. >=20 > This patch is to update PatchFv.py to make it work again. >=20 > Signed-off-by: Bob Feng > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Star Zeng > Cc: Yunhua Feng > Cc: Zhiguang Liu > ---V2: Support both the old Fv map file format and new Fv map file format= . > IntelFsp2Pkg/Tools/PatchFv.py | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/IntelFsp2Pkg/Tools/PatchFv.py=20 > b/IntelFsp2Pkg/Tools/PatchFv.py index 0c8d908063..112de4077a 100644 > --- a/IntelFsp2Pkg/Tools/PatchFv.py > +++ b/IntelFsp2Pkg/Tools/PatchFv.py > @@ -359,20 +359,23 @@ class Symbols: > rptLine =3D fdIn.readline() modName =3D "" fou= ndModHdr =3D False > while (rptLine !=3D "" ): if rptLine[0] !=3D ' ':- = #DxeIpl (Fixed Flash > Address, BaseAddress=3D0x00fffb4310, EntryPoint=3D0x00fffb4958)- > #(GUID=3D86D70125-BAA3-4296-A62F- > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb4= 178 > )- match =3D re.match("([_a-zA-Z0-9\-]+)\s\(.+BaseAddress= =3D(0x[0-9a-fA- > F]+),\s+EntryPoint=3D(0x[0-9a-fA-F]+)\)", rptLine)+ #DxeIp= l (Fixed Flash > Address, BaseAddress=3D0x00fffb4310, EntryPoint=3D0x00fffb4958,Type=3DPE)= +=20 > match =3D re.match("([_a-zA-Z0-9\-]+)\s\(.+BaseAddress=3D(0x[0-9a-fA- > F]+),\s+EntryPoint=3D(0x[0-9a-fA-F]+),\s*Type=3D\w+\)", rptLine)+ = if match > is None:+ #DxeIpl (Fixed Flash Address, BaseAddress=3D= 0x00fffb4310, > EntryPoint=3D0x00fffb4958)+ match =3D re.match("([_a-z= A-Z0-9\- > ]+)\s\(.+BaseAddress=3D(0x[0-9a-fA-F]+),\s+EntryPoint=3D(0x[0-9a-fA-F]+)\= )", rptLine) > if match is not None: foundModHdr =3D True = modName =3D > match.group(1) if len(modName) =3D=3D 36: = modName =3D > self.dictGuidNameXref[modName.upper()] > self.dictModBase['%s:BASE' % modName] =3D int (match.group(2), 16)=20 > self.dictModBase['%s:ENTRY' % modName] =3D int (match.group(3), 16)+ > #(GUID=3D86D70125-BAA3-4296-A62F- > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398=20 > .databaseaddress=3D0x00fffb4178) match =3D re.match("\(GUID=3D([A-Z0-9\-]= +)\s+\.textbaseaddress=3D(0x[0-9a-fA- > F]+)\s+\.databaseaddress=3D(0x[0-9a-fA-F]+)\)", rptLine) = if match is not > None: if foundModHdr: foundMo= dHdr =3D False > else:-- > 2.29.1.windows.1 >=20 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#67597):=20 > https://edk2.groups.io/g/devel/message/67597 > Mute This Topic: https://groups.io/mt/78284512/1777047 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub=20 > [chasel.chiu@intel.com] -=3D- =3D-=3D-=3D-=3D-=3D >=20