BaseTools: extend FFS alignment to 16M
Current FFS only supports 64KiB alignment for data, Per PI 1.6 requirement, we extend FFS alignment to 16M. Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
@@ -50,14 +50,17 @@ STATIC CHAR8 *mFfsFileType[] = {
|
||||
|
||||
STATIC CHAR8 *mAlignName[] = {
|
||||
"1", "2", "4", "8", "16", "32", "64", "128", "256", "512",
|
||||
"1K", "2K", "4K", "8K", "16K", "32K", "64K"
|
||||
"1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K",
|
||||
"512K", "1M", "2M", "4M", "8M", "16M"
|
||||
};
|
||||
|
||||
STATIC CHAR8 *mFfsValidAlignName[] = {
|
||||
"8", "16", "128", "512", "1K", "4K", "32K", "64K"
|
||||
"8", "16", "128", "512", "1K", "4K", "32K", "64K", "128K","256K",
|
||||
"512K", "1M", "2M", "4M", "8M", "16M"
|
||||
};
|
||||
|
||||
STATIC UINT32 mFfsValidAlign[] = {0, 8, 16, 128, 512, 1024, 4096, 32768, 65536};
|
||||
STATIC UINT32 mFfsValidAlign[] = {0, 8, 16, 128, 512, 1024, 4096, 32768, 65536, 131072, 262144,
|
||||
524288, 1048576, 2097152, 4194304, 8388608, 16777216};
|
||||
|
||||
STATIC EFI_GUID mZeroGuid = {0};
|
||||
|
||||
@@ -144,12 +147,13 @@ Returns:
|
||||
fprintf (stdout, " -s, --checksum Indicates to calculate file checksum.\n");
|
||||
fprintf (stdout, " -a FileAlign, --align FileAlign\n\
|
||||
FileAlign points to file alignment, which only support\n\
|
||||
the following align: 1,2,4,8,16,128,512,1K,4K,32K,64K\n");
|
||||
the following align: 1,2,4,8,16,128,512,1K,4K,32K,64K\n\
|
||||
128K,256K,512K,1M,2M,4M,8M,16M\n");
|
||||
fprintf (stdout, " -i SectionFile, --sectionfile SectionFile\n\
|
||||
Section file will be contained in this FFS file.\n");
|
||||
fprintf (stdout, " -n SectionAlign, --sectionalign SectionAlign\n\
|
||||
SectionAlign points to section alignment, which support\n\
|
||||
the alignment scope 1~64K. It is specified together\n\
|
||||
the alignment scope 1~16M. It is specified together\n\
|
||||
with sectionfile to point its alignment in FFS file.\n");
|
||||
fprintf (stdout, " -v, --verbose Turn on verbose output with informational messages.\n");
|
||||
fprintf (stdout, " -q, --quiet Disable all messages except key message and fatal error\n");
|
||||
@@ -168,7 +172,7 @@ StringtoAlignment (
|
||||
|
||||
Routine Description:
|
||||
|
||||
Converts Align String to align value (1~64K).
|
||||
Converts Align String to align value (1~16M).
|
||||
|
||||
Arguments:
|
||||
|
||||
@@ -893,7 +897,12 @@ Returns:
|
||||
}
|
||||
VerboseMsg ("the size of the generated FFS file is %u bytes", (unsigned) FileSize);
|
||||
|
||||
FfsFileHeader.Attributes = (EFI_FFS_FILE_ATTRIBUTES) (FfsAttrib | (FfsAlign << 3));
|
||||
//FfsAlign larger than 7, set FFS_ATTRIB_DATA_ALIGNMENT2
|
||||
if (FfsAlign < 8) {
|
||||
FfsFileHeader.Attributes = (EFI_FFS_FILE_ATTRIBUTES) (FfsAttrib | (FfsAlign << 3));
|
||||
} else {
|
||||
FfsFileHeader.Attributes = (EFI_FFS_FILE_ATTRIBUTES) (FfsAttrib | ((FfsAlign & 0x7) << 3) | FFS_ATTRIB_DATA_ALIGNMENT2);
|
||||
}
|
||||
|
||||
//
|
||||
// Fill in checksums and state, these must be zero for checksumming
|
||||
|
@@ -1,7 +1,7 @@
|
||||
/** @file
|
||||
This file contains the internal functions required to generate a Firmware Volume.
|
||||
|
||||
Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
Portions Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>
|
||||
Portions Copyright (c) 2016 HP Development Company, L.P.<BR>
|
||||
This program and the accompanying materials
|
||||
@@ -464,57 +464,97 @@ Returns:
|
||||
case 0:
|
||||
//
|
||||
// 1 byte alignment
|
||||
//if bit 1 have set, 128K byte alignmnet
|
||||
//
|
||||
*Alignment = 0;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 17;
|
||||
} else {
|
||||
*Alignment = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 1:
|
||||
//
|
||||
// 16 byte alignment
|
||||
//if bit 1 have set, 256K byte alignment
|
||||
//
|
||||
*Alignment = 4;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 18;
|
||||
} else {
|
||||
*Alignment = 4;
|
||||
}
|
||||
break;
|
||||
|
||||
case 2:
|
||||
//
|
||||
// 128 byte alignment
|
||||
//if bit 1 have set, 512K byte alignment
|
||||
//
|
||||
*Alignment = 7;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 19;
|
||||
} else {
|
||||
*Alignment = 7;
|
||||
}
|
||||
break;
|
||||
|
||||
case 3:
|
||||
//
|
||||
// 512 byte alignment
|
||||
//if bit 1 have set, 1M byte alignment
|
||||
//
|
||||
*Alignment = 9;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 20;
|
||||
} else {
|
||||
*Alignment = 9;
|
||||
}
|
||||
break;
|
||||
|
||||
case 4:
|
||||
//
|
||||
// 1K byte alignment
|
||||
//if bit 1 have set, 2M byte alignment
|
||||
//
|
||||
*Alignment = 10;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 21;
|
||||
} else {
|
||||
*Alignment = 10;
|
||||
}
|
||||
break;
|
||||
|
||||
case 5:
|
||||
//
|
||||
// 4K byte alignment
|
||||
//if bit 1 have set, 4M byte alignment
|
||||
//
|
||||
*Alignment = 12;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 22;
|
||||
} else {
|
||||
*Alignment = 12;
|
||||
}
|
||||
break;
|
||||
|
||||
case 6:
|
||||
//
|
||||
// 32K byte alignment
|
||||
//if bit 1 have set , 8M byte alignment
|
||||
//
|
||||
*Alignment = 15;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 23;
|
||||
} else {
|
||||
*Alignment = 15;
|
||||
}
|
||||
break;
|
||||
|
||||
case 7:
|
||||
//
|
||||
// 64K byte alignment
|
||||
//if bit 1 have set, 16M alignment
|
||||
//
|
||||
*Alignment = 16;
|
||||
if (FfsFile->Attributes & FFS_ATTRIB_DATA_ALIGNMENT2) {
|
||||
*Alignment = 24;
|
||||
} else {
|
||||
*Alignment = 16;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -1060,7 +1100,7 @@ Returns:
|
||||
// Clear the alignment bits: these have become meaningless now that we have
|
||||
// adjusted the padding section.
|
||||
//
|
||||
FfsFile->Attributes &= ~FFS_ATTRIB_DATA_ALIGNMENT;
|
||||
FfsFile->Attributes &= ~(FFS_ATTRIB_DATA_ALIGNMENT | FFS_ATTRIB_DATA_ALIGNMENT2);
|
||||
|
||||
//
|
||||
// Recalculate the FFS header checksum. Instead of setting Header and State
|
||||
|
@@ -74,7 +74,8 @@ STATIC CHAR8 *mGUIDedSectionAttribue[] = { "NONE", "PROCESSING_REQUIRED",
|
||||
|
||||
STATIC CHAR8 *mAlignName[] = {
|
||||
"1", "2", "4", "8", "16", "32", "64", "128", "256", "512",
|
||||
"1K", "2K", "4K", "8K", "16K", "32K", "64K"
|
||||
"1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K",
|
||||
"512K", "1M", "2M", "4M", "8M", "16M"
|
||||
};
|
||||
|
||||
//
|
||||
@@ -184,7 +185,7 @@ Returns:
|
||||
used in Ver section.\n");
|
||||
fprintf (stdout, " --sectionalign SectionAlign\n\
|
||||
SectionAlign points to section alignment, which support\n\
|
||||
the alignment scope 1~64K. It is specified in same\n\
|
||||
the alignment scope 1~16M. It is specified in same\n\
|
||||
order that the section file is input.\n");
|
||||
fprintf (stdout, " -v, --verbose Turn on verbose output with informational messages.\n");
|
||||
fprintf (stdout, " -q, --quiet Disable all messages except key message and fatal error\n");
|
||||
@@ -356,7 +357,7 @@ StringtoAlignment (
|
||||
|
||||
Routine Description:
|
||||
|
||||
Converts Align String to align value (1~64K).
|
||||
Converts Align String to align value (1~16M).
|
||||
|
||||
Arguments:
|
||||
|
||||
|
@@ -4,7 +4,7 @@
|
||||
@par Revision Reference:
|
||||
Version 1.4.
|
||||
|
||||
Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
|
||||
|
||||
This program and the accompanying materials are licensed and made available
|
||||
under the terms and conditions of the BSD License which accompanies this
|
||||
@@ -65,6 +65,7 @@ typedef UINT8 EFI_FFS_FILE_STATE;
|
||||
// FFS File Attributes.
|
||||
//
|
||||
#define FFS_ATTRIB_LARGE_FILE 0x01
|
||||
#define FFS_ATTRIB_DATA_ALIGNMENT2 0x02
|
||||
#define FFS_ATTRIB_FIXED 0x04
|
||||
#define FFS_ATTRIB_DATA_ALIGNMENT 0x38
|
||||
#define FFS_ATTRIB_CHECKSUM 0x40
|
||||
|
Reference in New Issue
Block a user