From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 8EB5921C943F4 for ; Thu, 22 Jun 2017 12:53:49 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CE2772B; Thu, 22 Jun 2017 12:55:14 -0700 (PDT) Received: from u201365.usa.Arm.com (bc-c3-3-14.eu.iaas.arm.com [10.6.43.238]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4202D3F587; Thu, 22 Jun 2017 12:55:13 -0700 (PDT) From: Supreeth Venkatesh To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, michael.d.kinney@intel.com, liming.gao@intel.com, achin.gupta@arm.com, supreeth.venkatesh@arm.com, felixp@ami.com, jbrasen@qti.qualcomm.com, jonathan.zhang@cavium.com, Jiewen Yao Date: Thu, 22 Jun 2017 20:54:17 +0100 Message-Id: <1498161266-18877-2-git-send-email-supreeth.venkatesh@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498161266-18877-1-git-send-email-supreeth.venkatesh@arm.com> References: <1498161266-18877-1-git-send-email-supreeth.venkatesh@arm.com> Subject: [PATCH v3 01/10] BaseTools: Tools change to support PI v1.5 Specification. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jun 2017 19:53:49 -0000 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 Signed-off-by: Supreeth Venkatesh --- 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