From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.17974.1629072967100981739 for ; Sun, 15 Aug 2021 17:16:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=hoUkVjZR; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bob.c.feng@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10077"; a="212656039" X-IronPort-AV: E=Sophos;i="5.84,324,1620716400"; d="scan'208";a="212656039" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2021 17:16:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,324,1620716400"; d="scan'208";a="519321255" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by FMSMGA003.fm.intel.com with ESMTP; 15 Aug 2021 17:16:04 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Sun, 15 Aug 2021 17:16:04 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Sun, 15 Aug 2021 17:16:04 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.177) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Sun, 15 Aug 2021 17:16:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YU/NbZWFX6HEVrO+7N92eyAcTDqiYzjgqPJoZ1+VWHInSthwkl1ueGRs5G7LsNF5jppx60sSvlV3WwoqalMdgOdAnq5SRXVYIJ8CRIsy+mmmnxNFUZ/2DJb7X+xstoRKORy4B92vkw9poSzOvdYO1/nKpWLlyW1FTbOC1aSLLjm1010OUdUomczhCXAc4fCNM8YOKDDcmntsYHhdEM8EakVxLZkRrg3f+VI9mP/ltzAnZr++xrVa3vOll/cHvosEZIz6B9wP7tqT1GIhnaqo9CmgO0kSHKgmRWUTIN9nXoNkp23cYIpVt2JqY/nS6C/F8NW7dD1fQnenmQN5tecKKA== 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=ZWaWH0FpCHZyuv0RDdEjCFnjdpVBPGa7eUW78yz7vzY=; b=MT8ta0U6im0/I/FwuLV2KoG9TDjTc0hUqI7b5emKbfZ3HVWmtiQmomqX8UXh1UNUAM5BpxumIC181c1dQxOkLuy+N4aW4sJy8ng6PZq9BUdf/ZpcD7kqaifEyzl1NlSHSCQjiz3p6xFwBXJqoKVzMqx4Sn+ikWU4GueSU11GEMTX2OGVGtYqLI/usJZyyNe99yV2O/AmY/NZQ/oIisiCXv9BV1bHnfplKW8jC/wXlBUIRnCmDvGS+Wxkz6FhYLkeiFgLepsKFbeMglfm9e2a9qE2QsO0lxIguZqIzbEcN/OnI5+INIyaulSqsGBq8INU+2j0UvQmER0IoBkELhJd+g== 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=ZWaWH0FpCHZyuv0RDdEjCFnjdpVBPGa7eUW78yz7vzY=; b=hoUkVjZRTTU2YxO3oLDHUrfAoMYf1+tvsPTGrB4gxliW0D/IBMpnTrGtx6YzqUte1ZSTgibep/rGevxOeazluKQTJK33qIYa6vAhAaoJa4j/yNxiseXwyzdCl4tyq5PQGJwBlM3qkGoo32+wy6yVzOA8SQq0DgNh0El1D2kh51s= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB4075.namprd11.prod.outlook.com (2603:10b6:5:198::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Mon, 16 Aug 2021 00:16:03 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::e5cf:531:2b2:8ca8]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::e5cf:531:2b2:8ca8%2]) with mapi id 15.20.4415.023; Mon, 16 Aug 2021 00:16:02 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Chen, Christine" CC: Liming Gao , "Feng, Bob C" Subject: Re: [edk2-devel] [PATCH] [edk2-staging] BaseTools/FMMT: Change Fv Header to FileSystemGuid3. Thread-Topic: [edk2-devel] [PATCH] [edk2-staging] BaseTools/FMMT: Change Fv Header to FileSystemGuid3. Thread-Index: AQHXkOMAyABlOrVb2Ueh22Qn8vEp9qt1ReQA Date: Mon, 16 Aug 2021 00:16:02 +0000 Message-ID: References: <169B1D9D1FF83EA2.28384@groups.io> In-Reply-To: <169B1D9D1FF83EA2.28384@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 10dca38c-a347-4bc3-3f3f-08d9604b0868 x-ms-traffictypediagnostic: DM6PR11MB4075: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hBtoyCUufIPq7aY4XHMRPiozZeyUmO0w1F70v55fl1o6jrQHViAohi5c3jqeB0/aIjKF5lWz0COd1XGTAOFFZ/p/eCfuZP+aWvL6DJ634U4cEI9U+qjVgp9oA39DborLdnB1rwWPbMTSjvHVzqSs2I8XGQmgGDs1mrOa4kqknpiDV+jr9mGuXTbzPBh4ttV0QHKyuW+Z1sA7zJ7NBuw+2Vh1SVn+YcbXnsG9z5eTWcLlbqQR686FuktsA2OOs+xFEcqsDcde3m7UodVRJVFPPvYYaXTICQlZF9BRZN97tOdhmw3jC8AYzjUgvAMYGHWj4W+G9Su6KzbBAQpVeLrcM634npHVwvV8egCYyA+X4jTXi74kgDauAQdUg90tt4Ow978asES7GYeLd36gfdjxWP2J9bxEChUe6IoWaVEwLGDox80GCbVM/CxVnIq0lLif5tXv9ig9LtT7fYcC6BrAuK0IPXLTt/uqOY3jLDFseAoCelwfxTvQHm4f/PodWGAuTdd3aqQwKHM13Ct2au0IwhPXxpd7dmXVJoltMjh8tjDkMm8d2z2iUvI43UYjB630UvxzvtaR6Xs++KCF7y+n2P/CX0SFV8do8nnXVfGwW2WPbddiLTogaWKUJnNtYW847ePQL2GDQ4AH/d6NOWYj4J+8cJVZYVGNS7aoSXI9Fwwd+fSBf/2ncoUmmQZD+LIzFP9ROY8gr6kUhdHVpadbzV6ql7LKhmEl7C9asPij6XTx9bSY55TleXg/SjtbUzvL87yhl041lBANCOq4Jb4LwNE6rkMesaYC8aGEGI44gCBwhaIVUOnj+yXcvgWrZKnz7c4QYD0OKBBnfBwTkNcMWw== 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)(366004)(122000001)(966005)(38070700005)(316002)(110136005)(86362001)(8676002)(38100700002)(83380400001)(508600001)(64756008)(66446008)(66556008)(76116006)(8936002)(66946007)(66476007)(26005)(55016002)(54906003)(9686003)(186003)(2906002)(71200400001)(107886003)(7696005)(52536014)(4326008)(5660300002)(6506007)(6636002)(33656002)(53546011);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?VhjMZCZ9m5+eOVojpn8wrifbbdE9NcUN9caHqb280o1JDQ3vumeTY/eQMd3/?= =?us-ascii?Q?6awA/3D6OFI2Y0jE5QjtALM2OoFKC0xFuKnpQqyPZ2GJ58JdTsTI6e70S61k?= =?us-ascii?Q?heeayZH7ZPl1/9E0eBHHKNEeRSM/htV1AupKMamzm1yG5VUTYRxMAt7jSrJW?= =?us-ascii?Q?XxPHI1AnSdGC4oL+UbsMRz7cgvVmMh3mVPYhEIStUNVjKWDDKwOU3lyAEP2e?= =?us-ascii?Q?UV228NbheTELvk4xgqFMbxMevs+Bi/BEnbDjJMqE0T3oOx2HZpYyzpuGQhoU?= =?us-ascii?Q?CmxMf0vcX8UoN4rSxe24rUyn2HRWVrT6xjKSzX/thZ60iO1LSQo/aplf6LTm?= =?us-ascii?Q?YuOJpNs661Bi7FJzkJ6ACShuSb/E2D4QxQBplv7PSrRfxhPRHd6Sg5B0RBln?= =?us-ascii?Q?9il1LSbgbhfESNxW5oYXqdjUX6z/8hULgHGCjwmcE6Vv50zvhsaIOWD4utRd?= =?us-ascii?Q?hyNjU3eABndR7R30mOLOcKgfF5Z/hzZCttVQldXvvDjYSQemIDZk+ootQ3cB?= =?us-ascii?Q?7JhXEiOL76WT21C7CAJkW4EhK5vocPDK8rB7TXVWjq7X9+vl/O31A9tIhrf4?= =?us-ascii?Q?LGIhKpFdkKZeXX1ewf6HWjKWkydRnPY0ZLTUzBzqDXej+3efvj38Rb3OV+5r?= =?us-ascii?Q?SdsgKUgvfbK+Q18VB9d/bMQuZaaJuCbg9bFcRA+QTu2kj54FJ1vtIr9JE87w?= =?us-ascii?Q?PPXye9kEs8Q52eTlmhs6zya31FRecWJDAfE1qQX/qSCQVw/QTnYpL2IWuEJj?= =?us-ascii?Q?twrXAqIaiGazfTjKvip48jiWm/1RpuUSDi5s1vqLYBEFhMBZFCz/uOWDAOkI?= =?us-ascii?Q?JNBPuw7dvTLe79oaJZFu1W8RRDcf2F4CzqX2CSOcmHaSAjSRJYQjCz73Ougx?= =?us-ascii?Q?cnIBi0chTOiex115IaJJCh9xk7MvlKM5WBBxLXQNuoAQQmxiUjfi5B1IfqeR?= =?us-ascii?Q?vG+41hGWB8x7Vk6BDzuSoMBNycwqdkVOwKKfQExZ3v43+ohHzell4xnjJNeX?= =?us-ascii?Q?byOG4iax4r+T45Vmf7aBUQIBQnSsTkgMNV+F9cTbmSjCwiN77D2V6F8U9xPp?= =?us-ascii?Q?4htW03ACKp3gEJIyaRqUu8EShoVDShth3JmlrW8kkHwxXWSyUJMem0DqXf46?= =?us-ascii?Q?Rd6clgt4BYXTemGe2gerly+K/Hy6icU/KjoaxPsPJRYjg8g3TwEMBAEY9sMF?= =?us-ascii?Q?sjFg01JNXAKfP8plxiuScFrNxfwpsszXODDCXWtrO6Kc/zdrFUzcKo2FKlRn?= =?us-ascii?Q?5XloUJ7XTKbpjZFHvWqD6qarCWKFFPgUSQ7F7mQejruCE9HWfWYpeONKzNim?= =?us-ascii?Q?Q3w=3D?= 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: 10dca38c-a347-4bc3-3f3f-08d9604b0868 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Aug 2021 00:16:02.8030 (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: 0AbbXwiMhWJLIFrAIwrIULA6xB/aFtHl7HI3h5FD5WBBXGMw4KK+Sl0pgcKDDemZWx/8VArDXG5SiT3J40k+5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4075 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 Reviewed-by: Bob Feng -----Original Message----- From: devel@edk2.groups.io On Behalf Of Bob Feng Sent: Saturday, August 14, 2021 4:04 PM To: devel@edk2.groups.io Cc: Chen, Christine ; Liming Gao Subject: [edk2-devel] [PATCH] [edk2-staging] BaseTools/FMMT: Change Fv Head= er to FileSystemGuid3. From: Yuwei Chen From: Yuwei Chen Following PI spec: when there has Ffs with EFI_FFS_FILE_HEADER2, the Parent= Fv of the Ffs need set to FileSystemGuid3; when all the Ffs with EFI_FFS_F= ILE_HEADER, the Parent Fv of the Ffs need set to FileSystemGuid2. Currently, when changing the Ffs in Fv from EFI_FFS_FILE_HEADER to EFI_FFS_= FILE_HEADER2, the Fv FileSystemGuid does not changed consistent with Ffs ty= pe.That caused build issue. As FileSystemGuid3 is compatible with FileSystemGuid2, change all the Fv he= ader to FileSystemGuid3. This patch modify the FMMT Add/ Replace function, = when adding/replacing a new Ffs, set the Parent Fv header to FileSystemGuid= 3 directly, do not double check size. Signed-off-by: Yuwei Chen Cc: Bob Feng Cc: Liming Gao --- BaseTools/Source/C/FMMT/FmmtLib.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c b/BaseTools/Source/C/FMMT/Fm= mtLib.c index 4f6056edba..e1436112ca 100644 --- a/BaseTools/Source/C/FMMT/FmmtLib.c +++ b/BaseTools/Source/C/FMMT/FmmtLib.c @@ -3198,11 +3198,7 @@ LibEncapsulateFfsToFv ( CHAR8* SystemCommandFormatString; CHAR8* = SystemCommand;- CHAR8* FfsGuid =3D "8c8ce578-8a3d-4f1c= -9935-896185c32dd3";-- if (IsLargeFile =3D=3D TRUE) {- FfsGuid =3D "547= 3c07a-3dcb-4dca-bd6f-1e9689e7349a";- }+ CHAR8* FfsGuid = =3D "5473c07a-3dcb-4dca-bd6f-1e9689e7349a"; SystemCommandFormatString = =3D NULL; SystemCommand =3D NULL;--=20 2.27.0.windows.1 GitPatchExtractor 1.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#79306): https://edk2.groups.io/g/devel/message/79306 Mute This Topic: https://groups.io/mt/84880534/1768742 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng@intel.com] -= =3D-=3D-=3D-=3D-=3D-=3D