From nobody Thu May 16 23:16:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67597+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67597+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1605493479; cv=none; d=zohomail.com; s=zohoarc; b=a6K1g0cBK1uXd8dszTZHQTvgQw2yQk5u8BGWio37+Bgr61h8bSH7odjoSfHMSXd0iQo0PurTTMKjncV+WYRzMzF1zv0yTieNHJt2TCse+JlX1B+PtpJ3HDeDkRYqGxPy5JcVTRvKhwk0snsy7wS/NDWuZaBkWSXYZu2PbwYVcz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605493479; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=O3IosJvqDfsKr42cx0thkFzm7HdUtdY4jcVRgJhEDFc=; b=UCtlzEuJ3Mvb+F3/NpK+Bh3KigKalD9ANhdbT4i/MliqnEZSscow/IfJAcc2uIgaM+TgkbnBwQYSizIQu/2FMB2GQ7dqCTcTv4RQGXvOkmBvhcO7R2KgVNIBVT+8zxod8qpcfay9H8q1A8i4t9MIMT/OXwC3M6Uok9jeP6eq4KY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67597+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1605493479461684.3768032778374; Sun, 15 Nov 2020 18:24:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mFQIYY1788612x6HBqGXTJ4D; Sun, 15 Nov 2020 18:24:39 -0800 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.29186.1605493473526315545 for ; Sun, 15 Nov 2020 18:24:33 -0800 IronPort-SDR: 9+bXPRdNj+wWVvoqY3O/u/7Q+W1j5kGScyWiMV+XVrJ5gsEOweKm+mY90/OCjB6dt4PePdqQxD 6sii+3Oahm2A== X-IronPort-AV: E=McAfee;i="6000,8403,9806"; a="255403903" X-IronPort-AV: E=Sophos;i="5.77,481,1596524400"; d="scan'208";a="255403903" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2020 18:24:32 -0800 IronPort-SDR: g5ukMaimA7nie37Db680Qu9ZoiTQRkIxfoHurSaLxSTGbq34msb1BHQri6Zwg38lVxq8mcejYC n0aEsDhiCmJA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,481,1596524400"; d="scan'208";a="533258502" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.32]) by fmsmga005.fm.intel.com with ESMTP; 15 Nov 2020 18:24:30 -0800 From: "Bob Feng" To: devel@edk2.groups.io Cc: Chasel Chiu , Nate DeSimone , Star Zeng , Yunhua Feng , Zhiguang Liu Subject: [edk2-devel] [Patch V2] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Date: Mon, 16 Nov 2020 10:24:22 +0800 Message-Id: <20201116022422.1597-1-bob.c.feng@intel.com> 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,bob.c.feng@intel.com X-Gm-Message-State: QkM98y1pSC3ZIlA7z4OWyHM0x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1605493479; bh=7ekJbZ5vxfKef+QzMCke1c51CRpP3FKKzPZJQ4ZZK+w=; h=Cc:Date:From:Reply-To:Subject:To; b=PdKL5qGW2sSwBuDAmidshXbo6+P/ZkBDklDMvvBaIzTd0DXsgOc0djzpO7nZWzpPT3Z v5TGouPQStQzx2vrHIDYJzPDmqqxIvSUkYSfyaElKAw1Ylzp0hqLUzjGP6ywYbQcwKjcQ Bl/ZYMdd3CccWnxRXy4l3L0gFHbAOlvOzAs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The commit 76e8aac158b0717fa27f12e4d008f79161ddb050 changed Fv map format. It added the image type to better support source level debug. But it broke the function of PatchFv.py because PatchFv.py also consume Fv map file. This patch is to update PatchFv.py to make it work again. Signed-off-by: Bob Feng Cc: Chasel Chiu Cc: Nate DeSimone Cc: Star Zeng Cc: Yunhua Feng Cc: Zhiguang Liu Reviewed-by: Chasel Chiu Reviewed-by: Star Zeng with a very minor comment inli= ne. --- 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(-) diff --git a/IntelFsp2Pkg/Tools/PatchFv.py 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 "" foundModHdr =3D False while (rptLine !=3D "" ): if rptLine[0] !=3D ' ': - #DxeIpl (Fixed Flash Address, BaseAddress=3D0x00fffb4310, = EntryPoint=3D0x00fffb4958) - #(GUID=3D86D70125-BAA3-4296-A62F-602BEBBB9081 .textbaseadd= ress=3D0x00fffb4398 .databaseaddress=3D0x00fffb4178) - 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) + #DxeIpl (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=3D0x00fffb43= 10, EntryPoint=3D0x00fffb4958) + 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) 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 .textbaseadd= ress=3D0x00fffb4398 .databaseaddress=3D0x00fffb4178) match =3D re.match("\(GUID=3D([A-Z0-9\-]+)\s+\.textbaseadd= ress=3D(0x[0-9a-fA-F]+)\s+\.databaseaddress=3D(0x[0-9a-fA-F]+)\)", rptLine) if match is not None: if foundModHdr: foundModHdr =3D False else: --=20 2.29.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 (#67597): https://edk2.groups.io/g/devel/message/67597 Mute This Topic: https://groups.io/mt/78284512/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-