From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.5470.1605767070515444531 for ; Wed, 18 Nov 2020 22:24:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=n3R2D//q; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: chasel.chiu@intel.com) IronPort-SDR: FI2YtfbMTTJzBwgogLPySnhIpzdajjVe73LLR6vg3dtfLiGWcfILB4AbhmlgDkr10R6/WhS8P/ CvUeC/fyauRw== X-IronPort-AV: E=McAfee;i="6000,8403,9809"; a="151087806" X-IronPort-AV: E=Sophos;i="5.77,489,1596524400"; d="scan'208";a="151087806" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2020 22:24:29 -0800 IronPort-SDR: lQCnTMpRtg+7orHpxAvQeV82eu0Cf/62hqLYsQrfkvIj93QZLwnvrSM/ZZAAeCc/czwrfdF6b1 PfQST0Di6Anw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,489,1596524400"; d="scan'208";a="368647384" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by FMSMGA003.fm.intel.com with ESMTP; 18 Nov 2020 22:24:29 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) 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 22:24:28 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX612.amr.corp.intel.com (10.22.229.25) 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 22:24:28 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx608.amr.corp.intel.com (10.22.229.21) 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 22:24:28 -0800 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (104.47.44.57) by edgegateway.intel.com (134.134.137.103) 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 22:24:28 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OXgEzcfxvGAtNn6wGCxPiHP4HIOiqzh2/5XEjHGCFeetNLsGNshhwPf4G3J/ZqYeLq/fQc3B9QFz8HGOymaegf1fN/DVvcOOnomQfWji195FU02wBcGfMC5ncVNvmpSQgbTq3pPOcNDXKMklJO5ba+V2tdGJ5GyZoifdTv75jAEZQs1h31isjHpLlQh2ZDSXcWFeTfS5xIVYRVl8p5TrhBTAP/9IuNvkN2GL3IdVV5AF+D/R7NVgLSuxVLaUnRHgad4jYNsLHDpdlAud5jCytCi/vm/PoB7ykk7nV6LyBS59Le5raNoyZS7lIrEJ0RRMcWNF53OECaCMfIoheQA53w== 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=JYbQTevbE5BQzHSq5KrdQquR7k4OA/kkQoZYkld9zkk=; b=BnjtIRm/VkRViou6O5VdUZlJ1YQMIusYuOWlkJ9JMbNmCgENr9CG2dpN4dnsROikDgXq1M2mUAQL1Bw3LdnwDyPTvik1Yk3bfCwmVAq+LjUiNbC7fbgbx05bbTrujXNL/h77ZO/zS/BncVRKD1wC/7YxjAxdqr8jm+rBFtIPsS8Pgl3A213pbToaYh/7jAkrD2tRmkQzperqY9yQsXfnxy0wX/gygQVCIqMAQIvSBM2L87p/dfJzwz/MHdM6ry51lJUtBxQQLaVowXIl0sVRJYtCIjBoIUj9/giNQV0lkIiky+DsidDzZekxu4a8S3V3Ked4BAjdaNT6Zd09dSuh7Q== 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=JYbQTevbE5BQzHSq5KrdQquR7k4OA/kkQoZYkld9zkk=; b=n3R2D//qmxnVOUlbGN7NEHnIoD6ykotfNNe/pEeNsxhnolXMiVPGGjjeFcxNEGINf+mEskP7oItI3cgwdqpUsimbBkQSx2Y145NrMyY5MHlj67HehNjVQfpcQNA4n5EY7wHe6kpqzQ5uyYUvbSpTXhUIn3Me5PLPoi3duaj1iao= Received: from DM6PR11MB2809.namprd11.prod.outlook.com (2603:10b6:5:c5::14) by DM5PR11MB1435.namprd11.prod.outlook.com (2603:10b6:4:7::18) 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 06:24:27 +0000 Received: from DM6PR11MB2809.namprd11.prod.outlook.com ([fe80::d4e9:6562:2e28:d3c0]) by DM6PR11MB2809.namprd11.prod.outlook.com ([fe80::d4e9:6562:2e28:d3c0%5]) with mapi id 15.20.3589.020; Thu, 19 Nov 2020 06:24:27 +0000 From: "Chiu, Chasel" To: "devel@edk2.groups.io" , "Feng, Bob C" 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: AQHWu7+my7oCJviiV02j0uxfP7AwKKnPAZ+w Date: Thu, 19 Nov 2020 06:24:27 +0000 Message-ID: References: <20201116022422.1597-1-bob.c.feng@intel.com> In-Reply-To: <20201116022422.1597-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [61.230.131.1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f76fd002-161f-434b-8c7e-08d88c53c411 x-ms-traffictypediagnostic: DM5PR11MB1435: 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: xvz8mFMbEjElDPNzxAhOHVzJ9XdXIgegcLCCoLp43LbH4TRr5ehG6r1xEGpLIaeVj5Ee6PArpd2IQRHQEzIpTfmMOONlw+n2nnPwqxVdgRl6iz+IKiSNDpbVXdBk/en5Aw5OACvXHS/ZIVRUu1ASyo/r7rkrenLkGu4CMfKfknfRnYiLPOE5vc3dw0F8hoAoJwCIw+pVf3pAHkmp3dj9JrqgB0feWjKUqOlaKIe6VZRsDfrrJJS5Z+/MYMIfQKcqedS2eDHJpwevoi+Z18XwGZJfxiZt3VzXzpTqYs749CabTojwQ/9sCHIOIjjmmyaBmlrHHreDkVJkX7U6UhJl6SIjusmoIxFFBFewSKyxMO3vK5H1XcCkVTjxvUBtxZaIY8TDjkipR9VmW6KMtntXdw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB2809.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(39860400002)(366004)(376002)(396003)(346002)(110136005)(55016002)(9686003)(52536014)(66946007)(83380400001)(6506007)(478600001)(186003)(19627235002)(66476007)(64756008)(76116006)(66446008)(53546011)(5660300002)(66556008)(26005)(966005)(7696005)(4326008)(107886003)(6636002)(33656002)(86362001)(8936002)(2906002)(8676002)(316002)(54906003)(71200400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 4agabGUlFpb3Y2YyuFGATJ3eacC0IgCzDunQ3Q453XeABqnhbWyI4jxI///LmnOOnG/J6/a2VrOehot0DnAjRWQ242I9tku51xhTJfufC0L4E8DpXQRswmpWNtcRviQDazhOyx0Ht6WFZ9k3i85mumbyCLxmN76gxKazu7V5zPF5ZhgI4tv3JZltAVMHUnKxyUNtRGR5llL8TmEiPG6jFS5xXq2noawAI/0oIkBSNTVIXwUexzMCTgoylker3ArCltsLkQD1tlb4oso3ccBVvLYqRIFil2i+1e60cx70qPTOKIprfarSnX8JLEumIhwe9BwaCxAGC3RC8/3vg4bT0tlxxMYNGH/B122chq7/VPCYUn10NlKdejIVziEjrGVMBmDfluhHvk/xpFJXZ5Zt9DJKjgdYvc3EFMgv9ICYqPuNU9ETs5FHtpsw1eJRKnGsa5bVmVOv+QyFag+cBhAT8abwVNFfqzJ7J2tNQvwCNxWvw7tLyBTKFygCD6FrxB8f+BvHLBKVywjmkRqUFZZLqE2o84TRsAjci5yIZBs3ojqAw7WfsVK7yVWH7pUUb8BZJJeosdRmzWKdADoE+uHFIL5j8/yS/b4u3lztK1LBbUgpPepZJb639SWAYn8yydBcf3PvXRuIJqF6IvEqnrdSTHilycMcTR5utrYA2AdPY4NdtEo8yxDsqT8z3kUuXnBd0TMjbceqEWLHBOM2aKYHjQ5Rd1RNSSsNk0vWR2wWqepnp3tfZOVsPNi0gDuRFWiaIfi+nPrtkdLPFlz84jQgm7JFpmKj+S/EWdNLAFr3Nu5pS6Qy8kl0TwZ6gZi2lsdlw0KBjNVDCzX7wmg5VSCBccVWkbnjXBZ3bXrk5SX5FdhU8+Glvvny3bJfy1o1ChAgpdKpPmnVRYK8UezBSZERzA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2809.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f76fd002-161f-434b-8c7e-08d88c53c411 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Nov 2020 06:24:27.1504 (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: T13uugU6n5K2sS45GUGekibo40uh6TnZ/HO97K92XhBytKlYt31b/CPjkb5KIcoiFVtHgF09VtJB9Sv3/DSRVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1435 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob Feng > Sent: Monday, November 16, 2020 10:24 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Zeng, Star ; Yunhu= a > Feng ; Liu, Zhiguang > Subject: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py to = parse > new Fv map file format >=20 > The commit 76e8aac158b0717fa27f12e4d008f79161ddb050 changed Fv map > format. > It added the image type to better support source level debug. But it brok= e the > function of PatchFv.py because PatchFv.py also consume Fv map file. >=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 b/IntelFsp2Pkg/Tools/PatchFv.p= y > 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)= + > 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) > self.dictModBase['%s:ENTRY' % modName] =3D int (match.group(3), 16)+ > #(GUID=3D86D70125-BAA3-4296-A62F- > 602BEBBB9081 .textbaseaddress=3D0x00fffb4398 .databaseaddress=3D0x00fffb4= 178) > 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): 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 [chasel.chiu@intel.com]= -=3D- > =3D-=3D-=3D-=3D-=3D >=20