[edk2-devel] [PATCH] [edk2-staging] BaseTools/FMMT: Change Fv Header to FileSystemGuid3.

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng at intel.com>

-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Bob Feng
Sent: Saturday, August 14, 2021 4:04 PM
To: devel at edk2.groups.io
Cc: Chen, Christine <yuwei.chen at intel.com>; Liming Gao <gaoliming at byosoft.com.cn>
Subject: [edk2-devel] [PATCH] [edk2-staging] BaseTools/FMMT: Change Fv Header to FileSystemGuid3.

From: Yuwei Chen <yuwei.chen at intel.com>

From: Yuwei Chen <yuwei.chen at intel.com>

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 <yuwei.chen at intel.com>
Cc: Bob Feng <bob.c.feng at intel.com>
Cc: Liming Gao <gaoliming at byosoft.com.cn>
---
 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/FmmtLib.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 = "8c8ce578-8a3d-4f1c-9935-896185c32dd3";--  if (IsLargeFile == TRUE) {-    FfsGuid = "5473c07a-3dcb-4dca-bd6f-1e9689e7349a";-  }+  CHAR8*                 FfsGuid = "5473c07a-3dcb-4dca-bd6f-1e9689e7349a";    SystemCommandFormatString = NULL;   SystemCommand             = NULL;-- 
2.27.0.windows.1
GitPatchExtractor 1.1


-=-=-=-=-=-=
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 at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [bob.c.feng at intel.com] -=-=-=-=-=-=




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#79324): https://edk2.groups.io/g/devel/message/79324
Mute This Topic: https://groups.io/mt/84880534/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-