## @file\r
# Global variables for GenFds\r
#\r
-# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>\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
##\r
# Import Modules\r
#\r
-import os\r
+import Common.LongFilePathOs as os\r
import sys\r
import subprocess\r
import struct\r
from AutoGen.BuildEngine import BuildRule\r
import Common.DataType as DataType\r
from Common.Misc import PathClass\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
\r
## Global variables\r
#\r
LibDir = ''\r
WorkSpace = None\r
WorkSpaceDir = ''\r
+ ConfDir = ''\r
EdkSourceDir = ''\r
OutputDirFromDscDict = {}\r
TargetName = ''\r
BuildRuleFamily = "MSFT"\r
ToolChainFamily = "MSFT"\r
__BuildRuleDatabase = None\r
+ GuidToolDefinition = {}\r
+ FfsCmdDict = {}\r
+ SecCmdList = []\r
+ CopyList = []\r
+ ModuleFile = ''\r
+ EnableGenfdsMultiThread = False\r
\r
#\r
# The list whose element are flags to indicate if large FFS or SECTION files exist in FV.\r
def __LoadBuildRule():\r
if GenFdsGlobalVariable.__BuildRuleDatabase:\r
return GenFdsGlobalVariable.__BuildRuleDatabase\r
- BuildConfigurationFile = os.path.normpath(os.path.join(GenFdsGlobalVariable.WorkSpaceDir, "Conf/target.txt"))\r
+ BuildConfigurationFile = os.path.normpath(os.path.join(GenFdsGlobalVariable.ConfDir, "target.txt"))\r
TargetTxt = TargetTxtClassObject()\r
if os.path.isfile(BuildConfigurationFile) == True:\r
TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
if DataType.TAB_TAT_DEFINES_BUILD_RULE_CONF in TargetTxt.TargetTxtDictionary:\r
BuildRuleFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_BUILD_RULE_CONF]\r
- if BuildRuleFile in [None, '']:\r
+ if not BuildRuleFile:\r
BuildRuleFile = 'Conf/build_rule.txt'\r
GenFdsGlobalVariable.__BuildRuleDatabase = BuildRule(BuildRuleFile)\r
ToolDefinitionFile = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_CONF]\r
@staticmethod\r
def GetBuildRules(Inf, Arch):\r
if not Arch:\r
- Arch = 'COMMON'\r
+ Arch = DataType.TAB_COMMON\r
\r
if not Arch in GenFdsGlobalVariable.OutputDirDict:\r
return {}\r
\r
TargetList = set()\r
FileList = []\r
- for File in Inf.Sources:\r
- if File.TagName in ("", "*", GenFdsGlobalVariable.ToolChainTag) and \\r
- File.ToolChainFamily in ("", "*", GenFdsGlobalVariable.ToolChainFamily):\r
- FileList.append((File, DataType.TAB_UNKNOWN_FILE))\r
- \r
+\r
+ if not Inf.IsBinaryModule:\r
+ for File in Inf.Sources:\r
+ if File.TagName in ("", "*", GenFdsGlobalVariable.ToolChainTag) and \\r
+ File.ToolChainFamily in ("", "*", GenFdsGlobalVariable.ToolChainFamily):\r
+ FileList.append((File, DataType.TAB_UNKNOWN_FILE))\r
+\r
for File in Inf.Binaries:\r
- if File.Target in ['COMMON', '*', GenFdsGlobalVariable.TargetName]:\r
+ if File.Target in [DataType.TAB_COMMON, '*', GenFdsGlobalVariable.TargetName]:\r
FileList.append((File, File.Type))\r
\r
for File, FileType in FileList:\r
Source = SourceList[Index]\r
Index = Index + 1\r
\r
- if File.IsBinary and File == Source and Inf.Binaries != None and File in Inf.Binaries:\r
+ if File.IsBinary and File == Source and Inf.Binaries is not None and File in Inf.Binaries:\r
# Skip all files that are not binary libraries\r
if not Inf.LibraryClass:\r
continue \r
SourceList.extend(Target.Outputs)\r
LastTarget = Target\r
FileType = DataType.TAB_UNKNOWN_FILE\r
+ for Cmd in Target.Commands:\r
+ if "$(CP)" == Cmd.split()[0]:\r
+ CpTarget = Cmd.split()[2]\r
+ TargetList.add(CpTarget)\r
\r
return list(TargetList)\r
\r
# @param ArchList The Arch list of platform\r
#\r
def SetDir (OutputDir, FdfParser, WorkSpace, ArchList):\r
- GenFdsGlobalVariable.VerboseLogger( "GenFdsGlobalVariable.OutputDir :%s" %OutputDir)\r
+ GenFdsGlobalVariable.VerboseLogger("GenFdsGlobalVariable.OutputDir :%s" % OutputDir)\r
# GenFdsGlobalVariable.OutputDirDict = OutputDir\r
GenFdsGlobalVariable.FdfParser = FdfParser\r
GenFdsGlobalVariable.WorkSpace = WorkSpace\r
- GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], 'FV')\r
+ GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], DataType.TAB_FV_DIRECTORY)\r
if not os.path.exists(GenFdsGlobalVariable.FvDir) :\r
os.makedirs(GenFdsGlobalVariable.FvDir)\r
GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')\r
if not os.path.exists(GenFdsGlobalVariable.FfsDir) :\r
os.makedirs(GenFdsGlobalVariable.FfsDir)\r
- if ArchList != None:\r
- GenFdsGlobalVariable.ArchList = ArchList\r
\r
T_CHAR_LF = '\n'\r
#\r
# Create FV Address inf file\r
#\r
GenFdsGlobalVariable.FvAddressFileName = os.path.join(GenFdsGlobalVariable.FfsDir, 'FvAddress.inf')\r
- FvAddressFile = open (GenFdsGlobalVariable.FvAddressFileName, 'w')\r
+ FvAddressFile = open(GenFdsGlobalVariable.FvAddressFileName, 'w')\r
#\r
# Add [Options]\r
#\r
break\r
\r
FvAddressFile.writelines("EFI_BOOT_DRIVER_BASE_ADDRESS = " + \\r
- BsAddress + \\r
+ BsAddress + \\r
T_CHAR_LF)\r
\r
RtAddress = '0'\r
RtAddress = GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].RtBaseAddress\r
\r
FvAddressFile.writelines("EFI_RUNTIME_DRIVER_BASE_ADDRESS = " + \\r
- RtAddress + \\r
+ RtAddress + \\r
T_CHAR_LF)\r
\r
FvAddressFile.close()\r
\r
+ def SetEnv(FdfParser, WorkSpace, ArchList, GlobalData):\r
+ GenFdsGlobalVariable.ModuleFile = WorkSpace.ModuleFile\r
+ GenFdsGlobalVariable.FdfParser = FdfParser\r
+ GenFdsGlobalVariable.WorkSpace = WorkSpace.Db\r
+ GenFdsGlobalVariable.ArchList = ArchList\r
+ GenFdsGlobalVariable.ToolChainTag = GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"]\r
+ GenFdsGlobalVariable.TargetName = GlobalData.gGlobalDefines["TARGET"]\r
+ GenFdsGlobalVariable.ActivePlatform = GlobalData.gActivePlatform\r
+ GenFdsGlobalVariable.EdkSourceDir = GlobalData.gGlobalDefines["EDK_SOURCE"]\r
+ GenFdsGlobalVariable.ConfDir = GlobalData.gConfDirectory\r
+ GenFdsGlobalVariable.EnableGenfdsMultiThread = GlobalData.gEnableGenfdsMultiThread\r
+ for Arch in ArchList:\r
+ GenFdsGlobalVariable.OutputDirDict[Arch] = os.path.normpath(\r
+ os.path.join(GlobalData.gWorkspace,\r
+ WorkSpace.Db.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,GlobalData.gGlobalDefines['TARGET'],\r
+ GlobalData.gGlobalDefines['TOOLCHAIN']].OutputDirectory,\r
+ GlobalData.gGlobalDefines['TARGET'] +'_' + GlobalData.gGlobalDefines['TOOLCHAIN']))\r
+ GenFdsGlobalVariable.OutputDirFromDscDict[Arch] = os.path.normpath(\r
+ WorkSpace.Db.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,\r
+ GlobalData.gGlobalDefines['TARGET'], GlobalData.gGlobalDefines['TOOLCHAIN']].OutputDirectory)\r
+ GenFdsGlobalVariable.PlatformName = WorkSpace.Db.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,\r
+ GlobalData.gGlobalDefines['TARGET'],\r
+ GlobalData.gGlobalDefines['TOOLCHAIN']].PlatformName\r
+ GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], DataType.TAB_FV_DIRECTORY)\r
+ if not os.path.exists(GenFdsGlobalVariable.FvDir):\r
+ os.makedirs(GenFdsGlobalVariable.FvDir)\r
+ GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')\r
+ if not os.path.exists(GenFdsGlobalVariable.FfsDir):\r
+ os.makedirs(GenFdsGlobalVariable.FfsDir)\r
+\r
+ T_CHAR_LF = '\n'\r
+ #\r
+ # Create FV Address inf file\r
+ #\r
+ GenFdsGlobalVariable.FvAddressFileName = os.path.join(GenFdsGlobalVariable.FfsDir, 'FvAddress.inf')\r
+ FvAddressFile = open(GenFdsGlobalVariable.FvAddressFileName, 'w')\r
+ #\r
+ # Add [Options]\r
+ #\r
+ FvAddressFile.writelines("[options]" + T_CHAR_LF)\r
+ BsAddress = '0'\r
+ for Arch in ArchList:\r
+ BsAddress = GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,\r
+ GlobalData.gGlobalDefines['TARGET'],\r
+ GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"]].BsBaseAddress\r
+ if BsAddress:\r
+ break\r
+\r
+ FvAddressFile.writelines("EFI_BOOT_DRIVER_BASE_ADDRESS = " + \\r
+ BsAddress + \\r
+ T_CHAR_LF)\r
+\r
+ RtAddress = '0'\r
+ for Arch in ArchList:\r
+ if GenFdsGlobalVariable.WorkSpace.BuildObject[\r
+ GenFdsGlobalVariable.ActivePlatform, Arch, GlobalData.gGlobalDefines['TARGET'],\r
+ GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"]].RtBaseAddress:\r
+ RtAddress = GenFdsGlobalVariable.WorkSpace.BuildObject[\r
+ GenFdsGlobalVariable.ActivePlatform, Arch, GlobalData.gGlobalDefines['TARGET'],\r
+ GlobalData.gGlobalDefines["TOOL_CHAIN_TAG"]].RtBaseAddress\r
+\r
+ FvAddressFile.writelines("EFI_RUNTIME_DRIVER_BASE_ADDRESS = " + \\r
+ RtAddress + \\r
+ T_CHAR_LF)\r
+\r
+ FvAddressFile.close()\r
+\r
## ReplaceWorkspaceMacro()\r
#\r
# @param String String that may contain macro\r
#\r
def ReplaceWorkspaceMacro(String):\r
+ String = mws.handleWsMacro(String)\r
Str = String.replace('$(WORKSPACE)', GenFdsGlobalVariable.WorkSpaceDir)\r
if os.path.exists(Str):\r
if not os.path.isabs(Str):\r
Str = os.path.abspath(Str)\r
else:\r
- Str = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, String)\r
+ Str = mws.join(GenFdsGlobalVariable.WorkSpaceDir, String)\r
return os.path.normpath(Str)\r
\r
## Check if the input files are newer than output files\r
if not os.path.exists(Output):\r
return True\r
# always update "Output" if no "Input" given\r
- if Input == None or len(Input) == 0:\r
+ if Input is None or len(Input) == 0:\r
return True\r
\r
# if fdf file is changed after the 'Output" is generated, update the 'Output'\r
\r
@staticmethod\r
def GenerateSection(Output, Input, Type=None, CompressionType=None, Guid=None,\r
- GuidHdrLen=None, GuidAttr=[], Ui=None, Ver=None, InputAlign=None, BuildNumber=None):\r
+ GuidHdrLen=None, GuidAttr=[], Ui=None, Ver=None, InputAlign=[], BuildNumber=None, DummyFile=None, IsMakefile=False):\r
Cmd = ["GenSec"]\r
- if Type not in [None, '']:\r
- Cmd += ["-s", Type]\r
- if CompressionType not in [None, '']:\r
- Cmd += ["-c", CompressionType]\r
- if Guid != None:\r
- Cmd += ["-g", Guid]\r
- if GuidHdrLen not in [None, '']:\r
- Cmd += ["-l", GuidHdrLen]\r
- if len(GuidAttr) != 0:\r
- #Add each guided attribute\r
- for Attr in GuidAttr:\r
- Cmd += ["-r", Attr]\r
- if InputAlign != None:\r
- #Section Align is only for dummy section without section type\r
- for SecAlign in InputAlign:\r
- Cmd += ["--sectionalign", SecAlign]\r
+ if Type:\r
+ Cmd += ("-s", Type)\r
+ if CompressionType:\r
+ Cmd += ("-c", CompressionType)\r
+ if Guid is not None:\r
+ Cmd += ("-g", Guid)\r
+ if DummyFile is not None:\r
+ Cmd += ("--dummy", DummyFile)\r
+ if GuidHdrLen:\r
+ Cmd += ("-l", GuidHdrLen)\r
+ #Add each guided attribute\r
+ for Attr in GuidAttr:\r
+ Cmd += ("-r", Attr)\r
+ #Section Align is only for dummy section without section type\r
+ for SecAlign in InputAlign:\r
+ Cmd += ("--sectionalign", SecAlign)\r
\r
CommandFile = Output + '.txt'\r
- if Ui not in [None, '']:\r
- #Cmd += ["-n", '"' + Ui + '"']\r
- SectionData = array.array('B', [0,0,0,0])\r
- SectionData.fromstring(Ui.encode("utf_16_le"))\r
- SectionData.append(0)\r
- SectionData.append(0)\r
- Len = len(SectionData)\r
- GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)\r
- SaveFileOnChange(Output, SectionData.tostring())\r
- elif Ver not in [None, '']:\r
- Cmd += ["-n", Ver]\r
+ if Ui:\r
+ if IsMakefile:\r
+ if Ui == "$(MODULE_NAME)":\r
+ Cmd += ('-n', Ui)\r
+ else:\r
+ Cmd += ("-n", '"' + Ui + '"')\r
+ Cmd += ("-o", Output)\r
+ if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
+ GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())\r
+ else:\r
+ SectionData = array.array('B', [0, 0, 0, 0])\r
+ SectionData.fromstring(Ui.encode("utf_16_le"))\r
+ SectionData.append(0)\r
+ SectionData.append(0)\r
+ Len = len(SectionData)\r
+ GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)\r
+ SaveFileOnChange(Output, SectionData.tostring())\r
+\r
+ elif Ver:\r
+ Cmd += ("-n", Ver)\r
if BuildNumber:\r
- Cmd += ["-j", BuildNumber]\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-j", BuildNumber)\r
+ Cmd += ("-o", Output)\r
\r
SaveFileOnChange(CommandFile, ' '.join(Cmd), False)\r
- if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
- return\r
-\r
- GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate section")\r
+ if IsMakefile:\r
+ if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
+ GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())\r
+ else:\r
+ if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
+ return\r
+ GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate section")\r
else:\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-o", Output)\r
Cmd += Input\r
\r
SaveFileOnChange(CommandFile, ' '.join(Cmd), False)\r
- if GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
+ if IsMakefile:\r
+ if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
+ GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())\r
+ elif GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate section")\r
-\r
- if (os.path.getsize(Output) >= GenFdsGlobalVariable.LARGE_FILE_SIZE and\r
- GenFdsGlobalVariable.LargeFileInFvFlags):\r
- GenFdsGlobalVariable.LargeFileInFvFlags[-1] = True \r
+ if (os.path.getsize(Output) >= GenFdsGlobalVariable.LARGE_FILE_SIZE and\r
+ GenFdsGlobalVariable.LargeFileInFvFlags):\r
+ GenFdsGlobalVariable.LargeFileInFvFlags[-1] = True\r
\r
@staticmethod\r
def GetAlignment (AlignString):\r
- if AlignString == None:\r
+ if AlignString is None:\r
return 0\r
- if AlignString in ("1K", "2K", "4K", "8K", "16K", "32K", "64K"):\r
+ if AlignString in ("1K", "2K", "4K", "8K", "16K", "32K", "64K", "128K", "256K", "512K"):\r
return int (AlignString.rstrip('K')) * 1024\r
+ elif AlignString in ("1M", "2M", "4M", "8M", "16M"):\r
+ return int (AlignString.rstrip('M')) * 1024 * 1024\r
else:\r
return int (AlignString)\r
\r
@staticmethod\r
def GenerateFfs(Output, Input, Type, Guid, Fixed=False, CheckSum=False, Align=None,\r
- SectionAlign=None):\r
+ SectionAlign=None, MakefilePath=None):\r
Cmd = ["GenFfs", "-t", Type, "-g", Guid]\r
+ mFfsValidAlign = ["0", "8", "16", "128", "512", "1K", "4K", "32K", "64K", "128K", "256K", "512K", "1M", "2M", "4M", "8M", "16M"]\r
if Fixed == True:\r
- Cmd += ["-x"]\r
+ Cmd.append("-x")\r
if CheckSum:\r
- Cmd += ["-s"]\r
- if Align not in [None, '']:\r
- Cmd += ["-a", Align]\r
-\r
- Cmd += ["-o", Output]\r
+ Cmd.append("-s")\r
+ if Align:\r
+ if Align not in mFfsValidAlign:\r
+ Align = GenFdsGlobalVariable.GetAlignment (Align)\r
+ for index in range(0, len(mFfsValidAlign) - 1):\r
+ if ((Align > GenFdsGlobalVariable.GetAlignment(mFfsValidAlign[index])) and (Align <= GenFdsGlobalVariable.GetAlignment(mFfsValidAlign[index + 1]))):\r
+ break\r
+ Align = mFfsValidAlign[index + 1]\r
+ Cmd += ("-a", Align)\r
+\r
+ Cmd += ("-o", Output)\r
for I in range(0, len(Input)):\r
Cmd += ("-i", Input[I])\r
- if SectionAlign not in [None, '', []] and SectionAlign[I] not in [None, '']:\r
+ if SectionAlign and SectionAlign[I]:\r
Cmd += ("-n", SectionAlign[I])\r
\r
CommandFile = Output + '.txt'\r
SaveFileOnChange(CommandFile, ' '.join(Cmd), False)\r
- if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
- return\r
- GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
\r
- GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate FFS")\r
+ GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
+ if MakefilePath:\r
+ if (tuple(Cmd),tuple(GenFdsGlobalVariable.SecCmdList),tuple(GenFdsGlobalVariable.CopyList)) not in GenFdsGlobalVariable.FfsCmdDict:\r
+ GenFdsGlobalVariable.FfsCmdDict[tuple(Cmd), tuple(GenFdsGlobalVariable.SecCmdList), tuple(GenFdsGlobalVariable.CopyList)] = MakefilePath\r
+ GenFdsGlobalVariable.SecCmdList = []\r
+ GenFdsGlobalVariable.CopyList = []\r
+ else:\r
+ if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
+ return\r
+ GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate FFS")\r
\r
@staticmethod\r
def GenerateFirmwareVolume(Output, Input, BaseAddress=None, ForceRebase=None, Capsule=False, Dump=False,\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
\r
Cmd = ["GenFv"]\r
- if BaseAddress not in [None, '']:\r
- Cmd += ["-r", BaseAddress]\r
- \r
+ if BaseAddress:\r
+ Cmd += ("-r", BaseAddress)\r
+\r
if ForceRebase == False:\r
- Cmd +=["-F", "FALSE"]\r
+ Cmd += ("-F", "FALSE")\r
elif ForceRebase == True:\r
- Cmd +=["-F", "TRUE"]\r
- \r
+ Cmd += ("-F", "TRUE")\r
+\r
if Capsule:\r
- Cmd += ["-c"]\r
+ Cmd.append("-c")\r
if Dump:\r
- Cmd += ["-p"]\r
- if AddressFile not in [None, '']:\r
- Cmd += ["-a", AddressFile]\r
- if MapFile not in [None, '']:\r
- Cmd += ["-m", MapFile]\r
+ Cmd.append("-p")\r
+ if AddressFile:\r
+ Cmd += ("-a", AddressFile)\r
+ if MapFile:\r
+ Cmd += ("-m", MapFile)\r
if FileSystemGuid:\r
- Cmd += ["-g", FileSystemGuid]\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-g", FileSystemGuid)\r
+ Cmd += ("-o", Output)\r
for I in Input:\r
- Cmd += ["-i", I]\r
+ Cmd += ("-i", I)\r
\r
GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate FV")\r
\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
\r
Cmd = ["GenVtf"]\r
- if BaseAddress not in [None, ''] and FvSize not in [None, ''] \\r
+ if BaseAddress and FvSize \\r
and len(BaseAddress) == len(FvSize):\r
for I in range(0, len(BaseAddress)):\r
- Cmd += ["-r", BaseAddress[I], "-s", FvSize[I]]\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-r", BaseAddress[I], "-s", FvSize[I])\r
+ Cmd += ("-o", Output)\r
for F in Input:\r
- Cmd += ["-f", F]\r
+ Cmd += ("-f", F)\r
\r
GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate VTF")\r
\r
@staticmethod\r
def GenerateFirmwareImage(Output, Input, Type="efi", SubType=None, Zero=False,\r
Strip=False, Replace=False, TimeStamp=None, Join=False,\r
- Align=None, Padding=None, Convert=False):\r
- if not GenFdsGlobalVariable.NeedsUpdate(Output, Input):\r
+ Align=None, Padding=None, Convert=False, IsMakefile=False):\r
+ if not GenFdsGlobalVariable.NeedsUpdate(Output, Input) and not IsMakefile:\r
return\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
\r
Cmd = ["GenFw"]\r
if Type.lower() == "te":\r
- Cmd += ["-t"]\r
- if SubType not in [None, '']:\r
- Cmd += ["-e", SubType]\r
- if TimeStamp not in [None, '']:\r
- Cmd += ["-s", TimeStamp]\r
- if Align not in [None, '']:\r
- Cmd += ["-a", Align]\r
- if Padding not in [None, '']:\r
- Cmd += ["-p", Padding]\r
+ Cmd.append("-t")\r
+ if SubType:\r
+ Cmd += ("-e", SubType)\r
+ if TimeStamp:\r
+ Cmd += ("-s", TimeStamp)\r
+ if Align:\r
+ Cmd += ("-a", Align)\r
+ if Padding:\r
+ Cmd += ("-p", Padding)\r
if Zero:\r
- Cmd += ["-z"]\r
+ Cmd.append("-z")\r
if Strip:\r
- Cmd += ["-l"]\r
+ Cmd.append("-l")\r
if Replace:\r
- Cmd += ["-r"]\r
+ Cmd.append("-r")\r
if Join:\r
- Cmd += ["-j"]\r
+ Cmd.append("-j")\r
if Convert:\r
- Cmd += ["-m"]\r
- Cmd += ["-o", Output]\r
+ Cmd.append("-m")\r
+ Cmd += ("-o", Output)\r
Cmd += Input\r
-\r
- GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate firmware image")\r
+ if IsMakefile:\r
+ if " ".join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
+ GenFdsGlobalVariable.SecCmdList.append(" ".join(Cmd).strip())\r
+ else:\r
+ GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate firmware image")\r
\r
@staticmethod\r
def GenerateOptionRom(Output, EfiInput, BinaryInput, Compress=False, ClassCode=None,\r
- Revision=None, DeviceId=None, VendorId=None):\r
+ Revision=None, DeviceId=None, VendorId=None, IsMakefile=False):\r
InputList = [] \r
Cmd = ["EfiRom"]\r
if len(EfiInput) > 0:\r
\r
if Compress:\r
- Cmd += ["-ec"]\r
+ Cmd.append("-ec")\r
else:\r
- Cmd += ["-e"]\r
+ Cmd.append("-e")\r
\r
for EfiFile in EfiInput:\r
- Cmd += [EfiFile]\r
+ Cmd.append(EfiFile)\r
InputList.append (EfiFile)\r
\r
if len(BinaryInput) > 0:\r
- Cmd += ["-b"]\r
+ Cmd.append("-b")\r
for BinFile in BinaryInput:\r
- Cmd += [BinFile]\r
+ Cmd.append(BinFile)\r
InputList.append (BinFile)\r
\r
# Check List\r
- if not GenFdsGlobalVariable.NeedsUpdate(Output, InputList):\r
+ if not GenFdsGlobalVariable.NeedsUpdate(Output, InputList) and not IsMakefile:\r
return\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, InputList))\r
\r
- if ClassCode != None:\r
- Cmd += ["-l", ClassCode]\r
- if Revision != None:\r
- Cmd += ["-r", Revision]\r
- if DeviceId != None:\r
- Cmd += ["-i", DeviceId]\r
- if VendorId != None:\r
- Cmd += ["-f", VendorId]\r
-\r
- Cmd += ["-o", Output] \r
- GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate option rom")\r
+ if ClassCode is not None:\r
+ Cmd += ("-l", ClassCode)\r
+ if Revision is not None:\r
+ Cmd += ("-r", Revision)\r
+ if DeviceId is not None:\r
+ Cmd += ("-i", DeviceId)\r
+ if VendorId is not None:\r
+ Cmd += ("-f", VendorId)\r
+\r
+ Cmd += ("-o", Output)\r
+ if IsMakefile:\r
+ if " ".join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
+ GenFdsGlobalVariable.SecCmdList.append(" ".join(Cmd).strip())\r
+ else:\r
+ GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate option rom")\r
\r
@staticmethod\r
- def GuidTool(Output, Input, ToolPath, Options='', returnValue=[]):\r
- if not GenFdsGlobalVariable.NeedsUpdate(Output, Input):\r
+ def GuidTool(Output, Input, ToolPath, Options='', returnValue=[], IsMakefile=False):\r
+ if not GenFdsGlobalVariable.NeedsUpdate(Output, Input) and not IsMakefile:\r
return\r
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
\r
Cmd = [ToolPath, ]\r
Cmd += Options.split(' ')\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-o", Output)\r
Cmd += Input\r
-\r
- GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to call " + ToolPath, returnValue)\r
+ if IsMakefile:\r
+ if " ".join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
+ GenFdsGlobalVariable.SecCmdList.append(" ".join(Cmd).strip())\r
+ else:\r
+ GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to call " + ToolPath, returnValue)\r
\r
def CallExternalTool (cmd, errorMess, returnValue=[]):\r
\r
sys.stdout.write('\n')\r
\r
try:\r
- PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr= subprocess.PIPE, shell=True)\r
+ PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)\r
except Exception, X:\r
EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0]))\r
(out, error) = PopenObject.communicate()\r
\r
- while PopenObject.returncode == None :\r
+ while PopenObject.returncode is None :\r
PopenObject.wait()\r
if returnValue != [] and returnValue[0] != 0:\r
#get command return value\r
returnValue[0] = PopenObject.returncode\r
return\r
if PopenObject.returncode != 0 or GenFdsGlobalVariable.VerboseMode or GenFdsGlobalVariable.DebugLevel != -1:\r
- GenFdsGlobalVariable.InfLogger ("Return Value = %d" %PopenObject.returncode)\r
+ GenFdsGlobalVariable.InfLogger ("Return Value = %d" % PopenObject.returncode)\r
GenFdsGlobalVariable.InfLogger (out)\r
GenFdsGlobalVariable.InfLogger (error)\r
if PopenObject.returncode != 0:\r
def InfLogger (msg):\r
EdkLogger.info(msg)\r
\r
- def ErrorLogger (msg, File = None, Line = None, ExtraData = None):\r
+ def ErrorLogger (msg, File=None, Line=None, ExtraData=None):\r
EdkLogger.error('GenFds', GENFDS_ERROR, msg, File, Line, ExtraData)\r
\r
def DebugLogger (Level, msg):\r
# @param Str String that may contain macro\r
# @param MacroDict Dictionary that contains macro value pair\r
#\r
- def MacroExtend (Str, MacroDict = {}, Arch = 'COMMON'):\r
- if Str == None :\r
+ def MacroExtend (Str, MacroDict={}, Arch=DataType.TAB_COMMON):\r
+ if Str is None :\r
return None\r
\r
Dict = {'$(WORKSPACE)' : GenFdsGlobalVariable.WorkSpaceDir,\r
'$(EDK_SOURCE)' : GenFdsGlobalVariable.EdkSourceDir,\r
# '$(OUTPUT_DIRECTORY)': GenFdsGlobalVariable.OutputDirFromDsc,\r
'$(TARGET)' : GenFdsGlobalVariable.TargetName,\r
- '$(TOOL_CHAIN_TAG)' : GenFdsGlobalVariable.ToolChainTag\r
+ '$(TOOL_CHAIN_TAG)' : GenFdsGlobalVariable.ToolChainTag,\r
+ '$(SPACE)' : ' '\r
}\r
OutputDir = GenFdsGlobalVariable.OutputDirFromDscDict[GenFdsGlobalVariable.ArchList[0]]\r
- if Arch != 'COMMON' and Arch in GenFdsGlobalVariable.ArchList:\r
+ if Arch != DataType.TAB_COMMON and Arch in GenFdsGlobalVariable.ArchList:\r
OutputDir = GenFdsGlobalVariable.OutputDirFromDscDict[Arch]\r
\r
Dict['$(OUTPUT_DIRECTORY)'] = OutputDir\r
\r
- if MacroDict != None and len (MacroDict) != 0:\r
+ if MacroDict is not None and len (MacroDict) != 0:\r
Dict.update(MacroDict)\r
\r
- for key in Dict.keys():\r
+ for key in Dict:\r
if Str.find(key) >= 0 :\r
Str = Str.replace (key, Dict[key])\r
\r
# @param PcdPattern pattern that labels a PCD.\r
#\r
def GetPcdValue (PcdPattern):\r
- if PcdPattern == None :\r
+ if PcdPattern is None :\r
return None\r
PcdPair = PcdPattern.lstrip('PCD(').rstrip(')').strip().split('.')\r
TokenSpace = PcdPair[0]\r
for Key in PcdDict:\r
PcdObj = PcdDict[Key]\r
if (PcdObj.TokenCName == TokenCName) and (PcdObj.TokenSpaceGuidCName == TokenSpace):\r
- if PcdObj.Type != 'FixedAtBuild':\r
+ if PcdObj.Type != DataType.TAB_PCDS_FIXED_AT_BUILD:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not FixedAtBuild type." % PcdPattern)\r
- if PcdObj.DatumType != 'VOID*':\r
+ if PcdObj.DatumType != DataType.TAB_VOID:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not VOID* datum type." % PcdPattern)\r
\r
PcdValue = PcdObj.DefaultValue\r
return PcdValue\r
- \r
- for Package in GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform, \r
- Arch, \r
- GenFdsGlobalVariable.TargetName, \r
+\r
+ for Package in GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform,\r
+ Arch,\r
+ GenFdsGlobalVariable.TargetName,\r
GenFdsGlobalVariable.ToolChainTag):\r
PcdDict = Package.Pcds\r
for Key in PcdDict:\r
PcdObj = PcdDict[Key]\r
if (PcdObj.TokenCName == TokenCName) and (PcdObj.TokenSpaceGuidCName == TokenSpace):\r
- if PcdObj.Type != 'FixedAtBuild':\r
+ if PcdObj.Type != DataType.TAB_PCDS_FIXED_AT_BUILD:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not FixedAtBuild type." % PcdPattern)\r
- if PcdObj.DatumType != 'VOID*':\r
+ if PcdObj.DatumType != DataType.TAB_VOID:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "%s is not VOID* datum type." % PcdPattern)\r
\r
PcdValue = PcdObj.DefaultValue\r
return PcdValue\r
\r
SetDir = staticmethod(SetDir)\r
+ SetEnv = staticmethod(SetEnv)\r
ReplaceWorkspaceMacro = staticmethod(ReplaceWorkspaceMacro)\r
CallExternalTool = staticmethod(CallExternalTool)\r
VerboseLogger = staticmethod(VerboseLogger)\r
projects / mirror_edk2.git / blobdiff