TAB_ARCH_COMMON = 'COMMON'\r
TAB_ARCH_IA32 = 'IA32'\r
TAB_ARCH_X64 = 'X64'\r
-TAB_ARCH_IPF = 'IPF'\r
TAB_ARCH_ARM = 'ARM'\r
TAB_ARCH_EBC = 'EBC'\r
TAB_ARCH_AARCH64 = 'AARCH64'\r
\r
-ARCH_SET_FULL = {TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_EBC, TAB_ARCH_AARCH64, TAB_ARCH_COMMON}\r
+ARCH_SET_FULL = {TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_ARM, TAB_ARCH_EBC, TAB_ARCH_AARCH64, TAB_ARCH_COMMON}\r
\r
SUP_MODULE_BASE = 'BASE'\r
SUP_MODULE_SEC = 'SEC'\r
TAB_SOURCES_COMMON = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_SOURCES_IA32 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_SOURCES_X64 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_SOURCES_IPF = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_SOURCES_ARM = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_SOURCES_EBC = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_SOURCES_AARCH64 = TAB_SOURCES + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_BINARIES_COMMON = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_BINARIES_IA32 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_BINARIES_X64 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_BINARIES_IPF = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_BINARIES_ARM = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_BINARIES_EBC = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_BINARIES_AARCH64 = TAB_BINARIES + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_INCLUDES_COMMON = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_INCLUDES_IA32 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_INCLUDES_X64 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_INCLUDES_IPF = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_INCLUDES_ARM = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_INCLUDES_EBC = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_INCLUDES_AARCH64 = TAB_INCLUDES + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_GUIDS_COMMON = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_GUIDS_IA32 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_GUIDS_X64 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_GUIDS_IPF = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_GUIDS_ARM = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_GUIDS_EBC = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_GUIDS_AARCH64 = TAB_GUIDS + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PROTOCOLS_COMMON = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PROTOCOLS_IA32 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PROTOCOLS_X64 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PROTOCOLS_IPF = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PROTOCOLS_ARM = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PROTOCOLS_EBC = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PROTOCOLS_AARCH64 = TAB_PROTOCOLS + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PPIS_COMMON = TAB_PPIS + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PPIS_IA32 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PPIS_X64 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PPIS_IPF = TAB_PPIS + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PPIS_ARM = TAB_PPIS + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PPIS_EBC = TAB_PPIS + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PPIS_AARCH64 = TAB_PPIS + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_LIBRARY_CLASSES_COMMON = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_LIBRARY_CLASSES_IA32 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_LIBRARY_CLASSES_X64 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_LIBRARY_CLASSES_IPF = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_LIBRARY_CLASSES_ARM = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_LIBRARY_CLASSES_EBC = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_LIBRARY_CLASSES_AARCH64 = TAB_LIBRARY_CLASSES + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PACKAGES_COMMON = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PACKAGES_IA32 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PACKAGES_X64 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PACKAGES_IPF = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PACKAGES_ARM = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PACKAGES_EBC = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PACKAGES_AARCH64 = TAB_PACKAGES + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PCDS_FIXED_AT_BUILD_COMMON = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PCDS_FIXED_AT_BUILD_IA32 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PCDS_FIXED_AT_BUILD_X64 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PCDS_FIXED_AT_BUILD_IPF = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PCDS_FIXED_AT_BUILD_ARM = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PCDS_FIXED_AT_BUILD_EBC = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PCDS_FIXED_AT_BUILD_AARCH64 = TAB_PCDS + TAB_PCDS_FIXED_AT_BUILD + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PCDS_PATCHABLE_IN_MODULE_COMMON = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PCDS_PATCHABLE_IN_MODULE_IA32 = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PCDS_PATCHABLE_IN_MODULE_X64 = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PCDS_PATCHABLE_IN_MODULE_IPF = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PCDS_PATCHABLE_IN_MODULE_ARM = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PCDS_PATCHABLE_IN_MODULE_EBC = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PCDS_PATCHABLE_IN_MODULE_AARCH64 = TAB_PCDS + TAB_PCDS_PATCHABLE_IN_MODULE + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PCDS_FEATURE_FLAG_COMMON = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PCDS_FEATURE_FLAG_IA32 = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PCDS_FEATURE_FLAG_X64 = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PCDS_FEATURE_FLAG_IPF = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PCDS_FEATURE_FLAG_ARM = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PCDS_FEATURE_FLAG_EBC = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PCDS_FEATURE_FLAG_AARCH64 = TAB_PCDS + TAB_PCDS_FEATURE_FLAG + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PCDS_DYNAMIC_EX_COMMON = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PCDS_DYNAMIC_EX_IA32 = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PCDS_DYNAMIC_EX_X64 = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PCDS_DYNAMIC_EX_IPF = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PCDS_DYNAMIC_EX_ARM = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PCDS_DYNAMIC_EX_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PCDS_DYNAMIC_EX_AARCH64 = TAB_PCDS + TAB_PCDS_DYNAMIC_EX + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_PCDS_DYNAMIC_COMMON = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_PCDS_DYNAMIC_IA32 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_PCDS_DYNAMIC_X64 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_PCDS_DYNAMIC_IPF = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_PCDS_DYNAMIC_ARM = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_PCDS_DYNAMIC_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_PCDS_DYNAMIC_AARCH64 = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_DEPEX_COMMON = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_DEPEX_IA32 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_DEPEX_X64 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_DEPEX_IPF = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_DEPEX_ARM = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_DEPEX_EBC = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_DEPEX_AARCH64 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_LIBRARIES_COMMON = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_LIBRARIES_IA32 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_LIBRARIES_X64 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_LIBRARIES_IPF = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_LIBRARIES_ARM = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_LIBRARIES_EBC = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_LIBRARIES_AARCH64 = TAB_LIBRARIES + TAB_SPLIT + TAB_ARCH_AARCH64\r
TAB_COMPONENTS_COMMON = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_COMMON\r
TAB_COMPONENTS_IA32 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_IA32\r
TAB_COMPONENTS_X64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_X64\r
-TAB_COMPONENTS_IPF = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_IPF\r
TAB_COMPONENTS_ARM = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_ARM\r
TAB_COMPONENTS_EBC = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_EBC\r
TAB_COMPONENTS_AARCH64 = TAB_COMPONENTS + TAB_SPLIT + TAB_ARCH_AARCH64\r
# SetVarDict[var] = value\r
self.SetVarDict = {}\r
self.RegionList = []\r
- self.vtfRawDict = {}\r
\r
## FFS data in FDF\r
#\r
self.CapsuleDataList = []\r
self.FmpPayloadList = []\r
\r
-## VTF component data in FDF\r
-#\r
-#\r
-class ComponentStatementClassObject :\r
- ## The constructor\r
- #\r
- # @param self The object pointer\r
- #\r
- def __init__(self):\r
- self.CompName = None\r
- self.CompLoc = None\r
- self.CompType = None\r
- self.CompVer = None\r
- self.CompCs = None\r
- self.CompBin = None\r
- self.CompSym = None\r
- self.CompSize = None\r
- self.FilePos = None\r
-\r
## OptionROM data in FDF\r
#\r
#\r
_SIZE_ = struct.Struct("20x 3B")\r
_STATE_ = struct.Struct("23x 1B")\r
\r
- VTF_GUID = "1BA0062E-C779-4582-8566-336AE8F78F09"\r
-\r
FFS_ATTRIB_FIXED = 0x04\r
FFS_ATTRIB_DATA_ALIGNMENT = 0x38\r
FFS_ATTRIB_CHECKSUM = 0x40\r
+++ /dev/null
-## @file\r
-# VTF components\r
-#\r
-# Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
-#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-\r
-##\r
-# Import Modules\r
-#\r
-from CommonDataClass.FdfClass import ComponentStatementClassObject\r
-\r
-## VTF components\r
-#\r
-#\r
-class ComponentStatement (ComponentStatementClassObject) :\r
- ## The constructor\r
- #\r
- # @param self The object pointer\r
- #\r
- def __init__(self):\r
- ComponentStatementClassObject.__init__(self)\r
for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict:\r
GenFdsGlobalVariable.VerboseLogger(FvObj)\r
\r
- GenFdsGlobalVariable.VerboseLogger('################### Gen VTF ####################')\r
- self.GenVtfFile()\r
-\r
HasCapsuleRegion = False\r
for RegionObj in self.RegionList:\r
if RegionObj.RegionType == 'CAPSULE':\r
PadRegion.Offset = PreviousRegionStart + PreviousRegionSize\r
PadRegion.Size = RegionObj.Offset - PadRegion.Offset\r
if not Flag:\r
- PadRegion.AddToBuffer(TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict)\r
+ PadRegion.AddToBuffer(TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict)\r
PreviousRegionStart = RegionObj.Offset\r
PreviousRegionSize = RegionObj.Size\r
#\r
if PreviousRegionSize > self.Size:\r
pass\r
GenFdsGlobalVariable.VerboseLogger('Call each region\'s AddToBuffer function')\r
- RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict)\r
+ RegionObj.AddToBuffer (TempFdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict)\r
\r
FdBuffer = BytesIO('')\r
PreviousRegionStart = -1\r
PadRegion.Offset = PreviousRegionStart + PreviousRegionSize\r
PadRegion.Size = RegionObj.Offset - PadRegion.Offset\r
if not Flag:\r
- PadRegion.AddToBuffer(FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict)\r
+ PadRegion.AddToBuffer(FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict)\r
PreviousRegionStart = RegionObj.Offset\r
PreviousRegionSize = RegionObj.Size\r
#\r
# Call each region's AddToBuffer function\r
#\r
GenFdsGlobalVariable.VerboseLogger('Call each region\'s AddToBuffer function')\r
- RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.vtfRawDict, self.DefineVarDict, Flag=Flag)\r
+ RegionObj.AddToBuffer (FdBuffer, self.BaseAddress, self.BlockSizeList, self.ErasePolarity, GenFdsGlobalVariable.ImageBinDict, self.DefineVarDict, Flag=Flag)\r
#\r
# Write the buffer contents to Fd file\r
#\r
GenFdsGlobalVariable.ImageBinDict[self.FdUiName.upper() + 'fd'] = FdFileName\r
return FdFileName\r
\r
- ## generate VTF\r
- #\r
- # @param self The object pointer\r
- #\r
- def GenVtfFile (self) :\r
- #\r
- # Get this Fd's all Fv name\r
- #\r
- FvAddDict ={}\r
- FvList = []\r
- for RegionObj in self.RegionList:\r
- if RegionObj.RegionType == BINARY_FILE_TYPE_FV:\r
- if len(RegionObj.RegionDataList) == 1:\r
- RegionData = RegionObj.RegionDataList[0]\r
- FvList.append(RegionData.upper())\r
- FvAddDict[RegionData.upper()] = (int(self.BaseAddress, 16) + \\r
- RegionObj.Offset, RegionObj.Size)\r
- else:\r
- Offset = RegionObj.Offset\r
- for RegionData in RegionObj.RegionDataList:\r
- FvList.append(RegionData.upper())\r
- FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(RegionData.upper())\r
- if len(FvObj.BlockSizeList) < 1:\r
- EdkLogger.error("GenFds", GENFDS_ERROR,\r
- 'FV.%s must point out FVs blocksize and Fv BlockNum' \\r
- % FvObj.UiFvName)\r
- else:\r
- Size = 0\r
- for blockStatement in FvObj.BlockSizeList:\r
- Size = Size + blockStatement[0] * blockStatement[1]\r
- FvAddDict[RegionData.upper()] = (int(self.BaseAddress, 16) + \\r
- Offset, Size)\r
- Offset = Offset + Size\r
- #\r
- # Check whether this Fd need VTF\r
- #\r
- Flag = False\r
- for VtfObj in GenFdsGlobalVariable.FdfParser.Profile.VtfList:\r
- compLocList = VtfObj.GetFvList()\r
- if set(compLocList).issubset(FvList):\r
- Flag = True\r
- break\r
- if Flag == True:\r
- self.vtfRawDict = VtfObj.GenVtf(FvAddDict)\r
-\r
## generate flash map file\r
#\r
# @param self The object pointer\r
from .RuleComplexFile import RuleComplexFile\r
from .RuleSimpleFile import RuleSimpleFile\r
from .EfiSection import EfiSection\r
-from .Vtf import Vtf\r
-from .ComponentStatement import ComponentStatement\r
from .OptionRom import OPTIONROM\r
from .OptRomInfStatement import OptRomInfStatement, OverrideAttribs\r
from .OptRomFileStatement import OptRomFileStatement\r
self.FdNameNotSet = False\r
self.FvDict = {}\r
self.CapsuleDict = {}\r
- self.VtfList = []\r
self.RuleDict = {}\r
self.OptRomDict = {}\r
self.FmpPayloadDict = {}\r
# [FV.UiName]\r
# [Capsule.UiName]\r
# [Rule]: don't take rule section into account, macro is not allowed in this section\r
- # [VTF.arch.UiName, arch]\r
# [OptionRom.DriverName]\r
self._CurSection = []\r
Section = Section.strip()[1:-1].upper().replace(' ', '').strip(TAB_SPLIT)\r
\r
if Item == TAB_COMMON_DEFINES.upper():\r
self._CurSection = [TAB_COMMON, TAB_COMMON, TAB_COMMON]\r
- elif Item == 'VTF' and len(ItemList) == 3:\r
- UiName = ItemList[2]\r
- Pos = UiName.find(TAB_COMMA_SPLIT)\r
- if Pos != -1:\r
- UiName = UiName[:Pos]\r
- self._CurSection = ['VTF', UiName, ItemList[1]]\r
elif len(ItemList) > 1:\r
self._CurSection = [ItemList[0], ItemList[1], TAB_COMMON]\r
elif len(ItemList) > 0:\r
#\r
# Keep processing sections of the FDF until no new sections or a syntax error is found\r
#\r
- while self._GetFd() or self._GetFv() or self._GetFmp() or self._GetCapsule() or self._GetVtf() or self._GetRule() or self._GetOptionRom():\r
+ while self._GetFd() or self._GetFv() or self._GetFmp() or self._GetCapsule() or self._GetRule() or self._GetOptionRom():\r
pass\r
\r
except Warning as X:\r
def SectionParser(self, section):\r
S = section.upper()\r
if not S.startswith("[DEFINES") and not S.startswith("[FD.") and not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM.") and not S.startswith('[FMPPAYLOAD.'):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.], [FMPPAYLOAD.])", self.FileName, self.CurrentLineNumber)\r
+ and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM.") and not S.startswith('[FMPPAYLOAD.'):\r
+ raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [Rule.], [OptionRom.], [FMPPAYLOAD.])", self.FileName, self.CurrentLineNumber)\r
\r
## _GetDefines() method\r
#\r
S = self._Token.upper()\r
if S.startswith(TAB_SECTION_START) and not S.startswith("[FD."):\r
if not S.startswith("[FV.") and not S.startswith('[FMPPAYLOAD.') and not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
+ and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
raise Warning("Unknown section", self.FileName, self.CurrentLineNumber)\r
self._UndoToken()\r
return False\r
\r
return False\r
\r
- ## _GetVtf() method\r
- #\r
- # Get VTF section contents and store its data into VTF list of self.Profile\r
- #\r
- # @param self The object pointer\r
- # @retval True Successfully find a VTF\r
- # @retval False Not able to find a VTF\r
- #\r
- def _GetVtf(self):\r
- HW_ARCH_SET = {TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_AARCH64}\r
- if not self._GetNextToken():\r
- return False\r
-\r
- S = self._Token.upper()\r
- if S.startswith(TAB_SECTION_START) and not S.startswith("[VTF."):\r
- self.SectionParser(S)\r
- self._UndoToken()\r
- return False\r
-\r
- self._UndoToken()\r
- if not self._IsToken("[VTF.", True):\r
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
- #print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
- # % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning.Expected("[VTF.]", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._SkipToToken(TAB_SPLIT):\r
- raise Warning.Expected("'.'", self.FileName, self.CurrentLineNumber)\r
-\r
- Arch = self._SkippedChars.rstrip(TAB_SPLIT).upper()\r
- if Arch not in HW_ARCH_SET:\r
- raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextWord():\r
- raise Warning.Expected("VTF name", self.FileName, self.CurrentLineNumber)\r
- Name = self._Token.upper()\r
-\r
- VtfObj = Vtf()\r
- VtfObj.UiName = Name\r
- VtfObj.KeyArch = Arch\r
-\r
- if self._IsToken(TAB_COMMA_SPLIT):\r
- if not self._GetNextWord():\r
- raise Warning.Expected("Arch list", self.FileName, self.CurrentLineNumber)\r
- if self._Token.upper() not in HW_ARCH_SET:\r
- raise Warning("Unknown Arch '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- VtfObj.ArchList = self._Token.upper()\r
-\r
- if not self._IsToken(TAB_SECTION_END):\r
- raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
-\r
- if self._IsKeyword("IA32_RST_BIN"):\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Reset file", self.FileName, self.CurrentLineNumber)\r
-\r
- VtfObj.ResetBin = self._Token\r
- if VtfObj.ResetBin.replace(TAB_WORKSPACE, '').find('$') == -1:\r
- #check for file path\r
- ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
- if ErrorCode != 0:\r
- EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
-\r
- while self._GetComponentStatement(VtfObj):\r
- pass\r
-\r
- self.Profile.VtfList.append(VtfObj)\r
- return True\r
-\r
- ## _GetComponentStatement() method\r
- #\r
- # Get components in VTF\r
- #\r
- # @param self The object pointer\r
- # @param VtfObj for whom component is got\r
- # @retval True Successfully find a component\r
- # @retval False Not able to find a component\r
- #\r
- def _GetComponentStatement(self, VtfObj):\r
- if not self._IsKeyword("COMP_NAME"):\r
- return False\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextWord():\r
- raise Warning.Expected("Component Name", self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj = ComponentStatement()\r
- CompStatementObj.CompName = self._Token\r
-\r
- if not self._IsKeyword("COMP_LOC"):\r
- raise Warning.Expected("COMP_LOC", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.CompLoc = ""\r
- if self._GetNextWord():\r
- CompStatementObj.CompLoc = self._Token\r
- if self._IsToken(TAB_VALUE_SPLIT):\r
- if not self._GetNextWord():\r
- raise Warning.Expected("Region Name", self.FileName, self.CurrentLineNumber)\r
-\r
- if self._Token not in {"F", "N", "S"}: #, "H", "L", "PH", "PL"): not support\r
- raise Warning("Unknown location type '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.FilePos = self._Token\r
- else:\r
- self.CurrentLineNumber += 1\r
- self.CurrentOffsetWithinLine = 0\r
-\r
- if not self._IsKeyword("COMP_TYPE"):\r
- raise Warning.Expected("COMP_TYPE", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component type", self.FileName, self.CurrentLineNumber)\r
- if self._Token not in {"FIT", "PAL_B", "PAL_A", "OEM"}:\r
- if not self._Token.startswith("0x") or len(self._Token) < 3 or len(self._Token) > 4 or \\r
- not self._Token[2] in hexdigits or not self._Token[-1] in hexdigits:\r
- raise Warning("Unknown location type '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- CompStatementObj.CompType = self._Token\r
-\r
- if not self._IsKeyword("COMP_VER"):\r
- raise Warning.Expected("COMP_VER", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component version", self.FileName, self.CurrentLineNumber)\r
-\r
- Pattern = compile('-$|[0-9a-fA-F]{1,2}\.[0-9a-fA-F]{1,2}$', DOTALL)\r
- if Pattern.match(self._Token) is None:\r
- raise Warning("Unknown version format '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- CompStatementObj.CompVer = self._Token\r
-\r
- if not self._IsKeyword("COMP_CS"):\r
- raise Warning.Expected("COMP_CS", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component CS", self.FileName, self.CurrentLineNumber)\r
- if self._Token not in {"1", "0"}:\r
- raise Warning("Unknown Component CS '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- CompStatementObj.CompCs = self._Token\r
-\r
-\r
- if not self._IsKeyword("COMP_BIN"):\r
- raise Warning.Expected("COMP_BIN", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component file", self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.CompBin = self._Token\r
- if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace(TAB_WORKSPACE, '').find('$') == -1:\r
- #check for file path\r
- ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
- if ErrorCode != 0:\r
- EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
-\r
- if not self._IsKeyword("COMP_SYM"):\r
- raise Warning.Expected("COMP_SYM", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component symbol file", self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.CompSym = self._Token\r
- if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace(TAB_WORKSPACE, '').find('$') == -1:\r
- #check for file path\r
- ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
- if ErrorCode != 0:\r
- EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
-\r
- if not self._IsKeyword("COMP_SIZE"):\r
- raise Warning.Expected("COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if self._IsToken("-"):\r
- CompStatementObj.CompSize = self._Token\r
- elif self._GetNextDecimalNumber():\r
- CompStatementObj.CompSize = self._Token\r
- elif self._GetNextHexNumber():\r
- CompStatementObj.CompSize = self._Token\r
- else:\r
- raise Warning("Unknown size '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
-\r
- VtfObj.ComponentStatementList.append(CompStatementObj)\r
- return True\r
-\r
## _GetOptionRom() method\r
#\r
# Get OptionROM section contents and store its data into OptionROM list of self.Profile\r
# @param BlockSize block size of FV\r
# @param BlockNum How many blocks in FV\r
# @param ErasePolarity Flash erase polarity\r
- # @param VtfDict VTF objects\r
# @param MacroDict macro value pair\r
# @retval string Generated FV file path\r
#\r
- def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', VtfDict=None, MacroDict = {}, Flag=False):\r
+ def AddToBuffer (self, Buffer, BaseAddress=None, BlockSize= None, BlockNum=None, ErasePloarity='1', MacroDict = {}, Flag=False):\r
if BaseAddress is None and self.UiFvName.upper() + 'fv' in GenFdsGlobalVariable.ImageBinDict:\r
return GenFdsGlobalVariable.ImageBinDict[self.UiFvName.upper() + 'fv']\r
\r
if self.FvBaseAddress is not None:\r
BaseAddress = self.FvBaseAddress\r
if not Flag:\r
- self._InitializeInf(BaseAddress, BlockSize, BlockNum, ErasePloarity, VtfDict)\r
+ self._InitializeInf(BaseAddress, BlockSize, BlockNum, ErasePloarity)\r
#\r
# First Process the Apriori section\r
#\r
# @param BlockSize block size of FV\r
# @param BlockNum How many blocks in FV\r
# @param ErasePolarity Flash erase polarity\r
- # @param VtfDict VTF objects\r
#\r
- def _InitializeInf (self, BaseAddress = None, BlockSize= None, BlockNum = None, ErasePloarity='1', VtfDict=None):\r
+ def _InitializeInf (self, BaseAddress = None, BlockSize= None, BlockNum = None, ErasePloarity='1'):\r
#\r
# Create FV inf file\r
#\r
# Add [Files]\r
#\r
self.FvInfFile.writelines("[files]" + TAB_LINE_BREAK)\r
- if VtfDict and self.UiFvName in VtfDict:\r
- self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r
- VtfDict[self.UiFvName] + \\r
- TAB_LINE_BREAK)\r
GenFdsGlobalVariable.ToolChainTag = ''\r
GenFdsGlobalVariable.RuleDict = {}\r
GenFdsGlobalVariable.ArchList = None\r
- GenFdsGlobalVariable.VtfDict = {}\r
GenFdsGlobalVariable.ActivePlatform = None\r
GenFdsGlobalVariable.FvAddressFileName = ''\r
GenFdsGlobalVariable.VerboseMode = False\r
if len(List) == 2:\r
if not List[1].strip():\r
EdkLogger.error("GenFds", OPTION_VALUE_INVALID, ExtraData="No Value given for Macro %s" %List[0])\r
- if List[0].strip() == "EFI_SOURCE":\r
- GlobalData.gEfiSource = List[1].strip()\r
- GlobalData.gGlobalDefines["EFI_SOURCE"] = GlobalData.gEfiSource\r
- continue\r
- elif List[0].strip() == "EDK_SOURCE":\r
- GlobalData.gEdkSource = List[1].strip()\r
- GlobalData.gGlobalDefines["EDK_SOURCE"] = GlobalData.gEdkSource\r
- continue\r
- elif List[0].strip() in ["WORKSPACE", "TARGET", "TOOLCHAIN"]:\r
+ if List[0].strip() in ["WORKSPACE", "TARGET", "TOOLCHAIN"]:\r
GlobalData.gGlobalDefines[List[0].strip()] = List[1].strip()\r
else:\r
GlobalData.gCommandLineDefines[List[0].strip()] = List[1].strip()\r
ToolChainTag = ''\r
RuleDict = {}\r
ArchList = None\r
- VtfDict = {}\r
ActivePlatform = None\r
FvAddressFileName = ''\r
VerboseMode = False\r
# @param BlockSize block size of region\r
# @param BlockNum How many blocks in region\r
# @param ErasePolarity Flash erase polarity\r
- # @param VtfDict VTF objects\r
# @param MacroDict macro value pair\r
# @retval string Generated FV file path\r
#\r
\r
- def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, vtfDict=None, MacroDict={}, Flag=False):\r
+ def AddToBuffer(self, Buffer, BaseAddress, BlockSizeList, ErasePolarity, ImageBinDict, MacroDict={}, Flag=False):\r
Size = self.Size\r
if not Flag:\r
GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
FvBaseAddress = '0x%X' % self.FvAddress\r
BlockSize = None\r
BlockNum = None\r
- FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, vtfDict, Flag=Flag)\r
+ FvObj.AddToBuffer(FvBuffer, FvBaseAddress, BlockSize, BlockNum, ErasePolarity, Flag=Flag)\r
if Flag:\r
continue\r
\r
+++ /dev/null
-## @file\r
-# process VTF generation\r
-#\r
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
-#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-\r
-##\r
-# Import Modules\r
-#\r
-from __future__ import absolute_import\r
-from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
-import Common.LongFilePathOs as os\r
-from Common.LongFilePathSupport import OpenLongFilePath as open\r
-from Common.DataType import TAB_LINE_BREAK\r
-\r
-## generate VTF\r
-#\r
-#\r
-class Vtf (object):\r
-\r
- ## The constructor\r
- #\r
- # @param self The object pointer\r
- #\r
- def __init__(self):\r
- self.KeyArch = None\r
- self.ArchList = None\r
- self.UiName = None\r
- self.ResetBin = None\r
- self.ComponentStatementList = []\r
-\r
- ## GenVtf() method\r
- #\r
- # Generate VTF\r
- #\r
- # @param self The object pointer\r
- # @param FdAddressDict dictionary contains FV name and its base address\r
- # @retval Dict FV and corresponding VTF file name\r
- #\r
- def GenVtf(self, FdAddressDict) :\r
- self.GenBsfInf()\r
- BaseAddArg = self.GetBaseAddressArg(FdAddressDict)\r
- OutputArg, VtfRawDict = self.GenOutputArg()\r
-\r
- Cmd = (\r
- 'GenVtf',\r
- ) + OutputArg + (\r
- '-f', self.BsfInfName,\r
- ) + BaseAddArg\r
-\r
- GenFdsGlobalVariable.CallExternalTool(Cmd, "GenFv -Vtf Failed!")\r
- GenFdsGlobalVariable.SharpCounter = 0\r
-\r
- return VtfRawDict\r
-\r
- ## GenBsfInf() method\r
- #\r
- # Generate inf used to generate VTF\r
- #\r
- # @param self The object pointer\r
- #\r
- def GenBsfInf (self):\r
- FvList = self.GetFvList()\r
- self.BsfInfName = os.path.join(GenFdsGlobalVariable.FvDir, self.UiName + '.inf')\r
- BsfInf = open(self.BsfInfName, 'w+')\r
- if self.ResetBin:\r
- BsfInf.writelines ("[OPTIONS]" + TAB_LINE_BREAK)\r
- BsfInf.writelines ("IA32_RST_BIN" + \\r
- " = " + \\r
- GenFdsGlobalVariable.MacroExtend(GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.ResetBin)) + \\r
- TAB_LINE_BREAK)\r
- BsfInf.writelines (TAB_LINE_BREAK)\r
-\r
- BsfInf.writelines ("[COMPONENTS]" + TAB_LINE_BREAK)\r
-\r
- for ComponentObj in self.ComponentStatementList :\r
- BsfInf.writelines ("COMP_NAME" + \\r
- " = " + \\r
- ComponentObj.CompName + \\r
- TAB_LINE_BREAK)\r
- if ComponentObj.CompLoc.upper() == 'NONE':\r
- BsfInf.writelines ("COMP_LOC" + \\r
- " = " + \\r
- 'N' + \\r
- TAB_LINE_BREAK)\r
-\r
- elif ComponentObj.FilePos:\r
- BsfInf.writelines ("COMP_LOC" + \\r
- " = " + \\r
- ComponentObj.FilePos + \\r
- TAB_LINE_BREAK)\r
- else:\r
- Index = FvList.index(ComponentObj.CompLoc.upper())\r
- if Index == 0:\r
- BsfInf.writelines ("COMP_LOC" + \\r
- " = " + \\r
- 'F' + \\r
- TAB_LINE_BREAK)\r
- elif Index == 1:\r
- BsfInf.writelines ("COMP_LOC" + \\r
- " = " + \\r
- 'S' + \\r
- TAB_LINE_BREAK)\r
-\r
- BsfInf.writelines ("COMP_TYPE" + \\r
- " = " + \\r
- ComponentObj.CompType + \\r
- TAB_LINE_BREAK)\r
- BsfInf.writelines ("COMP_VER" + \\r
- " = " + \\r
- ComponentObj.CompVer + \\r
- TAB_LINE_BREAK)\r
- BsfInf.writelines ("COMP_CS" + \\r
- " = " + \\r
- ComponentObj.CompCs + \\r
- TAB_LINE_BREAK)\r
-\r
- BinPath = ComponentObj.CompBin\r
- if BinPath != '-':\r
- BinPath = GenFdsGlobalVariable.MacroExtend(GenFdsGlobalVariable.ReplaceWorkspaceMacro(BinPath))\r
- BsfInf.writelines ("COMP_BIN" + \\r
- " = " + \\r
- BinPath + \\r
- TAB_LINE_BREAK)\r
-\r
- SymPath = ComponentObj.CompSym\r
- if SymPath != '-':\r
- SymPath = GenFdsGlobalVariable.MacroExtend(GenFdsGlobalVariable.ReplaceWorkspaceMacro(SymPath))\r
- BsfInf.writelines ("COMP_SYM" + \\r
- " = " + \\r
- SymPath + \\r
- TAB_LINE_BREAK)\r
- BsfInf.writelines ("COMP_SIZE" + \\r
- " = " + \\r
- ComponentObj.CompSize + \\r
- TAB_LINE_BREAK)\r
- BsfInf.writelines (TAB_LINE_BREAK)\r
-\r
- BsfInf.close()\r
-\r
- ## GenFvList() method\r
- #\r
- # Get FV list referenced by VTF components\r
- #\r
- # @param self The object pointer\r
- #\r
- def GetFvList(self):\r
- FvList = []\r
- for component in self.ComponentStatementList :\r
- if component.CompLoc.upper() != 'NONE' and not (component.CompLoc.upper() in FvList):\r
- FvList.append(component.CompLoc.upper())\r
-\r
- return FvList\r
-\r
- ## GetBaseAddressArg() method\r
- #\r
- # Get base address arguments for GenVtf\r
- #\r
- # @param self The object pointer\r
- #\r
- def GetBaseAddressArg(self, FdAddressDict):\r
- FvList = self.GetFvList()\r
- CmdStr = tuple()\r
- for i in FvList:\r
- (BaseAddress, Size) = FdAddressDict.get(i)\r
- CmdStr += (\r
- '-r', '0x%x' % BaseAddress,\r
- '-s', '0x%x' % Size,\r
- )\r
- return CmdStr\r
-\r
- ## GenOutputArg() method\r
- #\r
- # Get output arguments for GenVtf\r
- #\r
- # @param self The object pointer\r
- #\r
- def GenOutputArg(self):\r
- FvVtfDict = {}\r
- OutputFileName = ''\r
- FvList = self.GetFvList()\r
- Index = 0\r
- Arg = tuple()\r
- for FvObj in FvList:\r
- Index = Index + 1\r
- OutputFileName = 'Vtf%d.raw' % Index\r
- OutputFileName = os.path.join(GenFdsGlobalVariable.FvDir, OutputFileName)\r
- Arg += ('-o', OutputFileName)\r
- FvVtfDict[FvObj.upper()] = OutputFileName\r
-\r
- return Arg, FvVtfDict\r
-\r
\r
def MyOptionParser():\r
parser = OptionParser(version=__version__, prog="TargetTool.exe", usage=__usage__, description=__copyright__)\r
- parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32', 'X64', 'IPF', 'EBC', 'ARM', 'AARCH64', '0'], dest="TARGET_ARCH",\r
- help="ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC, which replaces target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option. 0 will clear this setting in target.txt and can't combine with other value.")\r
+ parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32', 'X64', 'EBC', 'ARM', 'AARCH64', '0'], dest="TARGET_ARCH",\r
+ help="ARCHS is one of list: IA32, X64, ARM, AARCH64 or EBC, which replaces target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option. 0 will clear this setting in target.txt and can't combine with other value.")\r
parser.add_option("-p", "--platform", action="callback", type="string", dest="DSCFILE", callback=SingleCheckCallback,\r
help="Specify a DSC file, which replace target.txt's ACTIVE_PLATFORM definition. 0 will clear this setting in target.txt and can't combine with other value.")\r
parser.add_option("-c", "--tooldef", action="callback", type="string", dest="TOOL_DEFINITION_FILE", callback=SingleCheckCallback,\r
Name = StrList[1]\r
RelativeAddress = int (StrList[2], 16) - OrigImageBaseAddress\r
FunctionList.append ((Name, RelativeAddress))\r
- if ModuleInfo.Arch == 'IPF' and Name.endswith('_ModuleEntryPoint'):\r
- #\r
- # Get the real entry point address for IPF image.\r
- #\r
- ModuleInfo.Image.EntryPoint = RelativeAddress\r
+\r
ImageMap.close()\r
#\r
# Add general information.\r
RtSize = 0\r
# reserve 4K size in SMRAM to make SMM module address not from 0.\r
SmmSize = 0x1000\r
- IsIpfPlatform = False\r
- if 'IPF' in self.ArchList:\r
- IsIpfPlatform = True\r
for ModuleGuid in ModuleList:\r
Module = ModuleList[ModuleGuid]\r
GlobalData.gProcessingFile = "%s [%s, %s, %s]" % (Module.MetaFile, Module.Arch, Module.ToolChain, Module.BuildTarget)\r
BtSize += ImageInfo.Image.Size\r
elif Module.ModuleType in [SUP_MODULE_DXE_RUNTIME_DRIVER, EDK_COMPONENT_TYPE_RT_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, EDK_COMPONENT_TYPE_SAL_RT_DRIVER]:\r
RtModuleList[Module.MetaFile] = ImageInfo\r
- #IPF runtime driver needs to be at 2 page alignment.\r
- if IsIpfPlatform and ImageInfo.Image.Size % 0x2000 != 0:\r
- ImageInfo.Image.Size = (ImageInfo.Image.Size / 0x2000 + 1) * 0x2000\r
RtSize += ImageInfo.Image.Size\r
elif Module.ModuleType in [SUP_MODULE_SMM_CORE, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]:\r
SmmModuleList[Module.MetaFile] = ImageInfo\r
TopMemoryAddress = self.LoadFixAddress\r
if TopMemoryAddress < RtSize + BtSize + PeiSize:\r
EdkLogger.error("build", PARAMETER_INVALID, "FIX_LOAD_TOP_MEMORY_ADDRESS is too low to load driver")\r
- # Make IPF runtime driver at 2 page alignment.\r
- if IsIpfPlatform:\r
- ReservedRuntimeMemorySize = TopMemoryAddress % 0x2000\r
- RtSize = RtSize + ReservedRuntimeMemorySize\r
\r
#\r
# Patch FixAddress related PCDs into EFI image\r
#\r
def MyOptionParser():\r
Parser = OptionParser(description=__copyright__, version=__version__, prog="build.exe", usage="%prog [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run]")\r
- Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32', 'X64', 'IPF', 'EBC', 'ARM', 'AARCH64'], dest="TargetArch",\r
- help="ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.")\r
+ Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32', 'X64', 'EBC', 'ARM', 'AARCH64'], dest="TargetArch",\r
+ help="ARCHS is one of list: IA32, X64, ARM, AARCH64 or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.")\r
Parser.add_option("-p", "--platform", action="callback", type="string", dest="PlatformFile", callback=SingleCheckCallback,\r
help="Build the platform specified by the DSC file name argument, overriding target.txt's ACTIVE_PLATFORM definition.")\r
Parser.add_option("-m", "--module", action="callback", type="string", dest="ModuleFile", callback=SingleCheckCallback,\r
projects / mirror_edk2.git / commitdiff