From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.47417.1628927634762440228 for ; Sat, 14 Aug 2021 00:53:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=PXeM4tvA; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: bob.c.feng@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10075"; a="215398473" X-IronPort-AV: E=Sophos;i="5.84,321,1620716400"; d="scan'208";a="215398473" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2021 00:53:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,321,1620716400"; d="scan'208";a="461592066" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga007.jf.intel.com with ESMTP; 14 Aug 2021 00:53:53 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Sat, 14 Aug 2021 00:53:52 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10 via Frontend Transport; Sat, 14 Aug 2021 00:53:52 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.45) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.10; Sat, 14 Aug 2021 00:53:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWO8waR3orsxDKZneotsQR4UNIp1UrriGAlD10DPWUb3FgNpGZ9RJ2LHjRM5UQuyLJx38Rl5vTyZy1NAzisjcU3lG+nMz5ocXqvy4q5GRkJxWNzDFso1NWadxcde6gU7gl30tRC2OYcVyVdmaQ+DbXJkA3mFOJA2D2WrK6UUmjodPtvKwua4EyFfbXlfSkMaqZwUskBs1q8l3nyNjwr+WD1AkjrR0ujrIScbO3dX0WbtNqSGfNzF9FZQVNRQhQfl69QZT5FfQyYFwVSeStkSOCUN33LENhvUYVNAHfX4OL520wwpZ57NAoHssY0Wp381E7d+pLyg7Ui/PJCbyZs9lw== 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=u3Rrq/ZjYnbxoSSqw8PMzBHyISyQxlv9H3wL7c8GeXg=; b=kDqL/RjGZrZyHlPjvd/gz/b0wA4wlLGfbjkSprrEiGQonqWop9Ts8bwYUO68AnBPYUfh05HEH7M+Av3P60YvnTPE9RE3qLUhXHT4EFrXIImUDbvnGih85BuLXdNlf3neqOe9QtJA0/jkA+O8vsVL0GY1NP8ETiwY1pmZH2Tok/F04INxkN7hBiqk05FGMdTQ/LtfH5kKjxJ3r6U1QEzTID44eBn0gjeuRmZ1URguUYUNJuLMhcbZd4sHyaiLKvguEhp3Stxbtze4XvdS/CtyhZwX3HIX3ucdCtfa5OVl/W4FKs9DsWbWM/ngPu0Ofp3uTkXXxredNyTk+IYLx7fzkg== 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=u3Rrq/ZjYnbxoSSqw8PMzBHyISyQxlv9H3wL7c8GeXg=; b=PXeM4tvAUTx6sqORZtJIufpiDISPvswbgBQKZVhhsDwYa4MJnhfOo/sT7kk5VFwQtnqbncApH5AQMwU6hSivzd8oUmt9FCVqZSA8XN3tczeQuDewnaonL8DJ0aFD/sy/f8mTfdnVpUET+zPUFiDPKMsjvup/gB+BGI6jtUX6YBQ= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (10.255.61.22) by DM8PR11MB5734.namprd11.prod.outlook.com (10.242.168.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.20; Sat, 14 Aug 2021 07:53:51 +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.021; Sat, 14 Aug 2021 07:53:51 +0000 From: "Bob Feng" To: "Chen, Christine" , "devel@edk2.groups.io" CC: Liming Gao Subject: Re: [PATCH 1/1] BaseTools/GenFds: Change FV Header to FileSystemGuid3. Thread-Topic: [PATCH 1/1] BaseTools/GenFds: Change FV Header to FileSystemGuid3. Thread-Index: AQHXjk3TRcL1frz73Uq44QAJHuGFMKtyplRg Date: Sat, 14 Aug 2021 07:53:51 +0000 Message-ID: References: <20210811011128.89-1-yuwei.chen@intel.com> In-Reply-To: <20210811011128.89-1-yuwei.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 80047107-3f0a-4968-6de9-08d95ef8a83b x-ms-traffictypediagnostic: DM8PR11MB5734: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PyalrWQWHfKNtdQ3yZt+rKX84F2iRs7TeBlE/GRaBzMhvGL+jAu3Ksc8REeFEFBjveEWi9pXQsWb4aH3n4ZOvtBww+7Q5nDYR1l7sUGqiUgGxmhdyKLeJnIuzWg4SyUAbR/iHBdD7wGf77IyNFlrAuYn8RQO33OGm61XmJpCVswzUuMzDcr9gxFBlmfBAfBaXZBMZlaS6jB511ysjcRhd3XRG5kT9hHbTnvYJyJ68/GDiWzuAlV+/tZ/ctm7OIw/luEjtRY8GtzbIUBmoewXf94o8xmBz+s5Ch2ro2/BbnsGcW/2V1hv4U0ZSWOqDWQpyaPtJKlqgRrdUqLRQW5os/NcBTO1RtRfXu9z5R0wHwCS9Jzmy1CZ+wZqFqByFg31kMQJzVZkjyzHOvOkAS+NXkwinDQQF5ezMdg45sAyyrwEKqEIbrGVIpAPa1OjA7q1fHoq31Hr+Eq26pQb9ZweNZaFrf+6CXOhmHkdvqdugXYInm2STW2TWeUYIUAY62Yr9zDUEtXiBm51uBBvzYg/b2/KVr8xjjKormx8M1slK3jUUitZWsFs1ZK8UhdQP1YEoUil/4X19aYOb03ZK+9xKTHqB4/NWs5NHSp3Q2ndClc6Zho7T2QwbJ+fXkULcrf3j4+0ON0JxgW3O1yB8xkBHuIKGepXR0yoM7PzgAXMH3o3r8HjCSKxYk8kIJsECMzVoHu6x/UYpIrAkc7IdsPY0Q== 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)(39860400002)(366004)(376002)(346002)(136003)(396003)(5660300002)(2906002)(55016002)(83380400001)(4326008)(478600001)(8676002)(122000001)(316002)(7696005)(9686003)(86362001)(8936002)(110136005)(71200400001)(53546011)(186003)(26005)(33656002)(6506007)(66556008)(38100700002)(66476007)(38070700005)(66446008)(52536014)(76116006)(64756008)(66946007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?OOvYf/8D6pI1rBftsP5tplQgnKqjBnfMynxY8WLe7lcmgCmxlCttwh4JJ7Gs?= =?us-ascii?Q?mmu/Gyot5VYq4MZubW9AoH4SOQjCcfHoo2fS1m1pZrmBv0Wkdp2EAmFJYsEb?= =?us-ascii?Q?WILonrgRFBE1V8kS5YfL9hvG0f/QtoF228pLdSfl+ARmkQ+zCLd4LH/isAF9?= =?us-ascii?Q?GwPMEUokwLyKiJwHnQQCn8VTRlY3CIXr0m31asrRreiEuapAMuM5YdckCp/0?= =?us-ascii?Q?qmIXkG3b5PUB/xAg314ElJvsvkw4VofCZLbz/usrE/OYWeg5XH9p27lRBU5v?= =?us-ascii?Q?qBOWmdu620Dm+ZpOiG1Z2Chw9iviwJG2/qcR4O7Ri+zaJ3kHT4WncKNyHRnp?= =?us-ascii?Q?7fcitzhLyIGlQ8LV6f/9tl7oTJujwWtK25nND6pxlAMflTBzNtf3DL6sCRFr?= =?us-ascii?Q?tKD5jr+JO5u/RvGNO6JFnKwJrk+l2ivSH4omI7dpMvQjHxHXkpXI1slc5jqm?= =?us-ascii?Q?zJi9mA0HkJCcU70KjZWhRdE4Z1K/y781HWF+WY+hahHonC1ANXstc3+r/UX8?= =?us-ascii?Q?kTwYTVXbwH791qtKb2ddQX8YKMmjQQWrJpJmSgexzAHelWrGe71fmDGBi0D5?= =?us-ascii?Q?tSOyjfBDvOhKOAkewLZ/nhoHJnAkdk95sseUeIbTM2fS5az/+7nYPXpPI6Wh?= =?us-ascii?Q?imoSyQqiUzheBTxERYeSvSjcIyhF/eraOSlMlJC0yWq8ypg9OpCogPqvvYhi?= =?us-ascii?Q?bg9xgBv24mqtDfgKDL/XXpw99IR12qSUAcEHxtqSieUws0ymRpbLIt3ic1mA?= =?us-ascii?Q?4HgQbNTXOS1IFRDEr5GMBXz85bSs8qkJ2EiNByLclkfQd++8xe7HPWpsbC4f?= =?us-ascii?Q?Q/fNBKMci9HHNL8IEWRTEq1/ml2SANTJPO/PjKIew9rsL1utUgC47V1PYvE7?= =?us-ascii?Q?9sYaonuiCxrkff7aY5+xnZnmUPYyr3uuK6fq1TAAly7y1YDZt2Ql2y037MXi?= =?us-ascii?Q?bbnZNM+VK/+dBJumRDiiEXophsGUuRvGQk/tgFiHRKmuPbc/7VO46SH24S17?= =?us-ascii?Q?VSscgt3glB5OGj0O8dK55hmcHRPUji39m56lptStszx8hgLBlgPDMmhr8BFd?= =?us-ascii?Q?Ha92003/u6zeovFRqWXWBmlvE1ZIs/iNnMorLBhhGuGOBK4v3+94fZuqjfa6?= =?us-ascii?Q?f3EW37cx0P+1ee0X1WJWPpHIKe5qC+Fn6zAKMec0DPMLGSn7L+NcYu4W4B3I?= =?us-ascii?Q?MZZoztYyD30OKu7tJI7MiQ4NKDo3aeeig8c2mykx9SXphAIZFZTjPnxG9snY?= =?us-ascii?Q?3L4UzSazp/eBklTPP1Z2vdTrHY8Wu+Z3FPZ2vmJidHo28hxAuYympkIHb7yI?= =?us-ascii?Q?SAnvw4qjWZjeZidLY9qcy0hU?= 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: 80047107-3f0a-4968-6de9-08d95ef8a83b X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Aug 2021 07:53:51.6023 (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: gdbrNzhorwaLRQa8WAYxpHECujJ3q+0N6d8AzvBXZmvaVbJSyLKEfQfszkouB8a58jFcaFhwDaco99PhRbdPRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR11MB5734 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: Chen, Christine =20 Sent: Wednesday, August 11, 2021 9:11 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao Subject: [PATCH 1/1] BaseTools/GenFds: Change FV Header to FileSystemGuid3. 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. This patch fixes this issue. As FileSystemGuid3 is compatible with FileSystemGuid2, change all the Fv he= ader to FileSystemGuid3. Signed-off-by: Yuwei Chen Cc: Bob Feng Cc: Liming Gao --- BaseTools/Source/C/GenFv/GenFv.c | 2 +- BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/Ge= nFv.c index 43cc5cd3fe82..af0c21db062a 100644 --- a/BaseTools/Source/C/GenFv/GenFv.c +++ b/BaseTools/Source/C/GenFv/GenFv.c @@ -225,7 +225,7 @@ Routine Description: // // Set the default FvGuid // - memcpy (&mFvDataInfo.FvFileSystemGuid, &mEfiFirmwareFileSystem2Guid, siz= eof (EFI_GUID)); + memcpy (&mFvDataInfo.FvFileSystemGuid, &mEfiFirmwareFileSystem3Guid,=20 + sizeof (EFI_GUID)); mFvDataInfo.ForceRebase =3D -1; =20 // diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseT= ools/Source/Python/GenFds/GenFdsGlobalVariable.py index 25f9d54874d3..fa559793824d 100644 --- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py +++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py @@ -599,6 +599,8 @@ class GenFdsGlobalVariable: if MapFile: Cmd +=3D ("-m", MapFile) if FileSystemGuid: + if FileSystemGuid =3D=3D EFI_FIRMWARE_FILE_SYSTEM2_GUID: + FileSystemGuid =3D EFI_FIRMWARE_FILE_SYSTEM3_GUID Cmd +=3D ("-g", FileSystemGuid) Cmd +=3D ("-o", Output) for I in Input: -- 2.27.0.windows.1