PI specification v1.5 defines new firmware volume file types. This patch adds the new file type EFI_FV_FILETYPE_SMM_STANDALONE and EFI_FV_FILETYPE_SMM_CORE_STANDALONE in GenFfs tool. *_SMM_* regex instead of *_MM_* is used to preserve backwards compatibility.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao <jiewen....@intel.com> Signed-off-by: Supreeth Venkatesh <supreeth.venkat...@arm.com> --- BaseTools/Source/C/GenFfs/GenFfs.c | 8 ++++++-- BaseTools/Source/C/Include/Common/PiFirmwareFile.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c index c5d657b..c394b8b 100644 --- a/BaseTools/Source/C/GenFfs/GenFfs.c +++ b/BaseTools/Source/C/GenFfs/GenFfs.c @@ -43,8 +43,10 @@ STATIC CHAR8 *mFfsFileType[] = { "EFI_FV_FILETYPE_SMM", // 0x0A "EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE",// 0x0B "EFI_FV_FILETYPE_COMBINED_SMM_DXE", // 0x0C - "EFI_FV_FILETYPE_SMM_CORE" // 0x0D - }; + "EFI_FV_FILETYPE_SMM_CORE", // 0x0D + "EFI_FV_FILETYPE_SMM_STANDALONE", // 0x0E + "EFI_FV_FILETYPE_SMM_CORE_STANDALONE" // 0x0F +}; STATIC CHAR8 *mAlignName[] = { "1", "2", "4", "8", "16", "32", "64", "128", "256", "512", @@ -130,6 +132,8 @@ Returns: EFI_FV_FILETYPE_DRIVER, EFI_FV_FILETYPE_APPLICATION,\n\ EFI_FV_FILETYPE_COMBINED_PEIM_DRIVER,\n\ EFI_FV_FILETYPE_SMM, EFI_FV_FILETYPE_SMM_CORE,\n\ + EFI_FV_FILETYPE_SMM_STANDALONE,\n\ + EFI_FV_FILETYPE_SMM_CORE_STANDALONE,\n\ EFI_FV_FILETYPE_COMBINED_SMM_DXE, \n\ EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE.\n"); fprintf (stdout, " -g FileGuid, --fileguid FileGuid\n\ diff --git a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h index 2984860..8b40ec2 100644 --- a/BaseTools/Source/C/Include/Common/PiFirmwareFile.h +++ b/BaseTools/Source/C/Include/Common/PiFirmwareFile.h @@ -52,6 +52,8 @@ typedef UINT8 EFI_FFS_FILE_STATE; #define EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE 0x0B #define EFI_FV_FILETYPE_COMBINED_SMM_DXE 0x0C #define EFI_FV_FILETYPE_SMM_CORE 0x0D +#define EFI_FV_FILETYPE_SMM_STANDALONE 0x0E +#define EFI_FV_FILETYPE_SMM_CORE_STANDALONE 0x0F #define EFI_FV_FILETYPE_OEM_MIN 0xc0 #define EFI_FV_FILETYPE_OEM_MAX 0xdf #define EFI_FV_FILETYPE_DEBUG_MIN 0xe0 -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel