From 2bc3256ca6d439ebf5d85d5e74e5f3e68df14130 Mon Sep 17 00:00:00 2001 From: "Gao, Liming" Date: Fri, 10 Jan 2014 05:25:50 +0000 Subject: Sync BaseTool trunk (version r2640) into EDKII BaseTools. Signed-off-by: Gao, Liming Reviewed-by: Liu, Jiang A git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15089 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/C/GenFv/GenFvInternalLib.c | 7 ++++--- BaseTools/Source/C/GenFv/GenFvInternalLib.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'BaseTools/Source/C/GenFv') diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c index d0df4ac13d..0522cf4254 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c @@ -458,9 +458,9 @@ Returns: case 0: // - // 8 byte alignment, mini alignment requirement for FFS file. + // 1 byte alignment // - *Alignment = 3; + *Alignment = 0; break; case 1: @@ -2212,7 +2212,8 @@ Returns: mFvDataInfo.FvNameGuid.Data4[7]); } - if (CompareGuid (&mFvDataInfo.FvFileSystemGuid, &mEfiFirmwareFileSystem2Guid) == 0) { + if (CompareGuid (&mFvDataInfo.FvFileSystemGuid, &mEfiFirmwareFileSystem2Guid) == 0 || + CompareGuid (&mFvDataInfo.FvFileSystemGuid, &mEfiFirmwareFileSystem3Guid) == 0) { mFvDataInfo.IsPiFvImage = TRUE; } diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.h b/BaseTools/Source/C/GenFv/GenFvInternalLib.h index 21993b5e7b..a9a00ec028 100644 --- a/BaseTools/Source/C/GenFv/GenFvInternalLib.h +++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.h @@ -168,7 +168,7 @@ Abstract: // VTF (Firmware Volume Top File) signatures // #define IA32_X64_VTF_SIGNATURE_OFFSET 0x14 -#define IA32_X64_VTF0_SIGNATURE EFI_SIGNATURE_32('V','T','F',0) +#define IA32_X64_VTF0_SIGNATURE SIGNATURE_32('V','T','F',0) // // Defines to calculate the offset for PEI CORE entry points -- cgit v1.2.3