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
# 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
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]], '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
\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, DummyFile=None, IsMakefile=False):\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 Type:\r
+ Cmd += ("-s", Type)\r
+ if CompressionType:\r
+ Cmd += ("-c", CompressionType)\r
if Guid is not None:\r
- Cmd += ["-g", Guid]\r
+ Cmd += ("-g", Guid)\r
if DummyFile is not None:\r
- Cmd += ["--dummy", DummyFile]\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 is not None:\r
- #Section Align is only for dummy section without section type\r
- for SecAlign in InputAlign:\r
- Cmd += ["--sectionalign", SecAlign]\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
+ if Ui:\r
if IsMakefile:\r
if Ui == "$(MODULE_NAME)":\r
- Cmd += ['-n', Ui]\r
+ Cmd += ('-n', Ui)\r
else:\r
- Cmd += ["-n", '"' + Ui + '"']\r
- Cmd += ["-o", Output]\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
GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)\r
SaveFileOnChange(Output, SectionData.tostring())\r
\r
- elif Ver not in [None, '']:\r
- Cmd += ["-n", Ver]\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 IsMakefile:\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
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.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
+ Cmd += ("-a", Align)\r
\r
- Cmd += ["-o", Output]\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
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
+ 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
+ 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
\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
if IsMakefile:\r
if " ".join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\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
GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, InputList))\r
\r
if ClassCode is not None:\r
- Cmd += ["-l", ClassCode]\r
+ Cmd += ("-l", ClassCode)\r
if Revision is not None:\r
- Cmd += ["-r", Revision]\r
+ Cmd += ("-r", Revision)\r
if DeviceId is not None:\r
- Cmd += ["-i", DeviceId]\r
+ Cmd += ("-i", DeviceId)\r
if VendorId is not None:\r
- Cmd += ["-f", VendorId]\r
+ Cmd += ("-f", VendorId)\r
\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-o", Output)\r
if IsMakefile:\r
if " ".join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
GenFdsGlobalVariable.SecCmdList.append(" ".join(Cmd).strip())\r
\r
Cmd = [ToolPath, ]\r
Cmd += Options.split(' ')\r
- Cmd += ["-o", Output]\r
+ Cmd += ("-o", Output)\r
Cmd += Input\r
if IsMakefile:\r
if " ".join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
projects / mirror_edk2.git / blobdiff