From nobody Wed May 8 20:25:17 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+79306+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+79306+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1628928251; cv=none; d=zohomail.com; s=zohoarc; b=ne3JLGUfOoSzMA/iSPGffmnNMJ2bu7ayXOpv6cUUlHYTvb0l4Jmjg16bNrTuiBF2DU4lLFSybZ2J2dwVU2R4PczY1hj0S7JkwhuDqTR+a9fb2LDqYdqZFGH+SrSLr7ZCbQOgSZaxMCzddPZU/UD+1V2r4biX4v7bY1S5zMCtYJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628928251; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=uPfJUMg1NGiSxUvlEv+pigw7IyaehxVLWbBbYuCIfc8=; b=JxiM6FRbqO6BOvmcPQ6XUN2HYDoGF45AmGDzPOzEqaF8eFL0dbbwBpzJ9Vcebcyhr+jTQRwUO4CjmvV6cwSrJe1eewFdFKHfCmUjhAk+xlni4INgSrzREJF2aNIGL0fHiXmn7O4sH+/JFjt94ztx4OjLtfSNvcVapvbe2Wp6XEE= 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+79306+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1628928251567513.8447429680292; Sat, 14 Aug 2021 01:04:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 62qUYY1788612xyOhMcsQTWz; Sat, 14 Aug 2021 01:04:11 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web08.47469.1628928249887350658 for ; Sat, 14 Aug 2021 01:04:10 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10075"; a="215698890" X-IronPort-AV: E=Sophos;i="5.84,321,1620716400"; d="scan'208";a="215698890" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2021 01:04:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,321,1620716400"; d="scan'208";a="486313744" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.137]) by fmsmga008.fm.intel.com with ESMTP; 14 Aug 2021 01:04:06 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Yuwei Chen , Liming Gao Subject: [edk2-devel] [PATCH] [edk2-staging] BaseTools/FMMT: Change Fv Header to FileSystemGuid3. Date: Sat, 14 Aug 2021 16:03:51 +0800 Message-Id: <20210814080351.2160-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: HpC5tD8d7CwsESEtuTeTfjKBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1628928251; bh=Rbf/j8tQqZSAmb3a/Crlu0lrO7gYcTW6hsDAigmxeJI=; h=Cc:Date:From:Reply-To:Subject:To; b=qS3Nx76vB6XUZqUWiITk5ed+4dahlrPNntx8jVCt04ehbulNbKMF0MBH7sQOiRBaArJ LZ7C9o6VclzUlcm9Hh2N1LtOlf0inkF0IrmT4z65Ier+MrC2OwNWFzbkSUnWGCo4vSVPo USrBPvOQCtwl8hevxYCzS9VSrou82fCWoVs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1628928253480100001 Content-Type: text/plain; charset="utf-8" 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_FILE_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 type.That caused build issue. As FileSystemGuid3 is compatible with FileSystemGuid2, change all the Fv header to FileSystemGuid3. This patch modify the FMMT Add/ Replace function, when adding/replacing a new Ffs, set the Parent Fv header to FileSystemGuid3 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 ( =20 CHAR8* SystemCommandFormatString; CHAR8* SystemCommand; - CHAR8* FfsGuid =3D "8c8ce578-8a3d-4f1c-9935-896185c32dd3= "; - - if (IsLargeFile =3D=3D TRUE) { - FfsGuid =3D "5473c07a-3dcb-4dca-bd6f-1e9689e7349a"; - } + CHAR8* FfsGuid =3D "5473c07a-3dcb-4dca-bd6f-1e9689e7349a= "; =20 SystemCommandFormatString =3D NULL; SystemCommand =3D NULL; --=20 2.27.0.windows.1 GitPatchExtractor 1.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 (#79306): https://edk2.groups.io/g/devel/message/79306 Mute This Topic: https://groups.io/mt/84880534/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-