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 A50E721C943F4 for ; Thu, 22 Jun 2017 12:54:22 -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 E44742B; Thu, 22 Jun 2017 12:55:47 -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 56FD63F587; Thu, 22 Jun 2017 12:55:46 -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:24 +0100 Message-Id: <1498161266-18877-9-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 08/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:54:22 -0000 This patch registers SMM_STANDALONE and SMM_CORE_STANDALONE module type with python build tools. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao Signed-off-by: Supreeth Venkatesh --- BaseTools/Source/Python/build/BuildReport.py | 4 +++- BaseTools/Source/Python/build/build.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py index 91d1e93..409aa54 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -123,6 +123,8 @@ gDriverTypeMap = { 'UEFI_APPLICATION' : '0x9 (APPLICATION)', 'SMM_CORE' : '0xD (SMM_CORE)', 'SMM_DRIVER' : '0xA (SMM)', # Extension of module type to support PI 1.1 SMM drivers + 'SMM_STANDALONE' : '0xE (SMM_STANDALONE)', + 'SMM_CORE_STANDALONE' : '0xF (SMM_CORE_STANDALONE)', } ## The look up table of the supported opcode in the dependency expression binaries @@ -374,7 +376,7 @@ class DepexReport(object): if not ModuleType: ModuleType = gComponentType2ModuleType.get(M.ComponentType, "") - if ModuleType in ["SEC", "PEI_CORE", "DXE_CORE", "SMM_CORE", "UEFI_APPLICATION"]: + if ModuleType in ["SEC", "PEI_CORE", "DXE_CORE", "SMM_CORE", "SMM_CORE_STANDALONE", "UEFI_APPLICATION"]: return for Source in M.SourceFileList: diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index fd94ae6..c67ccb7 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1499,7 +1499,7 @@ class Build(): if IsIpfPlatform and ImageInfo.Image.Size % 0x2000 != 0: ImageInfo.Image.Size = (ImageInfo.Image.Size / 0x2000 + 1) * 0x2000 RtSize += ImageInfo.Image.Size - elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER']: + elif Module.ModuleType in ['SMM_CORE', 'DXE_SMM_DRIVER', 'SMM_STANDALONE', 'SMM_CORE_STANDALONE']: SmmModuleList[Module.MetaFile] = ImageInfo SmmSize += ImageInfo.Image.Size if Module.ModuleType == 'DXE_SMM_DRIVER': -- 2.7.4