From nobody Thu May 16 19:06:56 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+67527+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+67527+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1605275849; cv=none; d=zohomail.com; s=zohoarc; b=nIPOFwu6MwEwNEkyQ91/S9IWuyPviVNRgO1atq3QxrhGgUsXiKL/lj7ftsO6wNCDvjLZHZN7hkc7GomZe/K82URbgYbZY5h3gvcW3PUHSh4JvvjUtWt2ItweKTAlz9D35WoEo5jtSke2O74Ak/PnCyRuZOtEEefZQglaC1XtY8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605275849; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=TRGEz9KohmxGpfuOk+O25/z/dlIYmDyqYGaYLqrCT4E=; b=UXt+yQCJyRg56K8yCNJukmkbzVoXTD85EJrEEWyeAYWFS/p/l9JE98qq/J3jpbbYseFHMO/qDAlX7pC6KIWY7I/ISRg7sf3/2Gs5U/ykteJFPP3lEM7qSJahQysx4mGHMnHGU9WnnSOYiHeNkRVpla1O1FJAOUUD+ShDkXygc/4= 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+67527+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 160527584907479.43123405568872; Fri, 13 Nov 2020 05:57:29 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id XRU2YY1788612xvxkx6BeGPg; Fri, 13 Nov 2020 05:57:27 -0800 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.4476.1605275842027945434 for ; Fri, 13 Nov 2020 05:57:22 -0800 IronPort-SDR: vDmQPfwkWBlbUUi6/5xQI8iJJ7/VxnI+bEaOu003kJ3yUZxYyZbVVx98NCJglJGTi5XD6wbHtz xAQ15JyLyJgg== X-IronPort-AV: E=McAfee;i="6000,8403,9803"; a="232090314" X-IronPort-AV: E=Sophos;i="5.77,475,1596524400"; d="scan'208";a="232090314" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2020 05:57:20 -0800 IronPort-SDR: p1PU8TH8Vkprfrj8i4mWOiR7lvD2df1RdcX/saSPGhZNMMicfQ/WE+SskDvqXRbI5+9BzRkr3a qBB4i3qJzAkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,475,1596524400"; d="scan'208";a="328880299" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.32]) by orsmga006.jf.intel.com with ESMTP; 13 Nov 2020 05:57:18 -0800 From: "Bob Feng" To: devel@edk2.groups.io Cc: Chasel Chiu , Nate DeSimone , Star Zeng , Yunhua Feng , Zhiguang Liu Subject: [edk2-devel] [Patch] IntelFsp2Pkg/Tools: Fixed PatchFv.py to parse new Fv map file format Date: Fri, 13 Nov 2020 21:57:16 +0800 Message-Id: <20201113135716.159-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: uIa4psw9N2TW8Vf4vB6zz9xmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1605275847; bh=X1QMNi7EYKKwU2J2tRIWc303SN6GCLSw20ZAc+Luztg=; h=Cc:Date:From:Reply-To:Subject:To; b=KrTX6dCEt33VIocnxdKsJqT5ZPUMUkJcmvRSOMppJqPT9olHZZ10ODZAu6BmK0QrU/S 7N8hh1qLB9G45mR9zdb7u8rInNzglz3PNeyPCLxNe98YEobqsLMuW3xNJAZfgITgPxgX7 kYhci4M1pOZvWdOG/6EO0yHCqMvVI/pXcG0= 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 --- IntelFsp2Pkg/Tools/PatchFv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntelFsp2Pkg/Tools/PatchFv.py b/IntelFsp2Pkg/Tools/PatchFv.py index 0c8d908063..f4c390a17b 100644 --- a/IntelFsp2Pkg/Tools/PatchFv.py +++ b/IntelFsp2Pkg/Tools/PatchFv.py @@ -361,11 +361,11 @@ class Symbols: 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) + 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 not None: foundModHdr =3D True modName =3D match.group(1) if len(modName) =3D=3D 36: modName =3D self.dictGuidNameXref[modName.upper()] --=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 (#67527): https://edk2.groups.io/g/devel/message/67527 Mute This Topic: https://groups.io/mt/78229423/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-