BaseTools: Replace Binary File type strings with predefined constant
BINARY_FILE_TYPE_FW was 'FW' BINARY_FILE_TYPE_GUID was 'GUID' BINARY_FILE_TYPE_PREEFORM was 'PREEFORM' BINARY_FILE_TYPE_UEFI_APP was 'UEFI_APP' BINARY_FILE_TYPE_UNI_UI was 'UNI_UI' BINARY_FILE_TYPE_UNI_VER was 'UNI_VER' BINARY_FILE_TYPE_LIB was 'LIB' BINARY_FILE_TYPE_PE32 was 'PE32' BINARY_FILE_TYPE_PIC was 'PIC' BINARY_FILE_TYPE_PEI_DEPEX was 'PEI_DEPEX' BINARY_FILE_TYPE_DXE_DEPEX was 'DXE_DEPEX' BINARY_FILE_TYPE_SMM_DEPEX was 'SMM_DEPEX' BINARY_FILE_TYPE_TE was 'TE' BINARY_FILE_TYPE_VER was 'VER' BINARY_FILE_TYPE_UI was 'UI' BINARY_FILE_TYPE_BIN was 'BIN' BINARY_FILE_TYPE_FV was 'FV' v2 - split apart FV and GUID types with different meanings. Cc: Liming Gao <liming.gao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
committed by
Yonghong Zhu
parent
be409b6756
commit
91fa33eeca
@@ -82,7 +82,7 @@ class DataSection (DataSectionClassObject):
|
||||
CopyLongFilePath(MapFile, CopyMapFile)
|
||||
|
||||
#Get PE Section alignment when align is set to AUTO
|
||||
if self.Alignment == 'Auto' and self.SecType in ('TE', 'PE32'):
|
||||
if self.Alignment == 'Auto' and self.SecType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):
|
||||
ImageObj = PeImageClass (Filename)
|
||||
if ImageObj.SectionAlignment < 0x400:
|
||||
self.Alignment = str (ImageObj.SectionAlignment)
|
||||
@@ -92,7 +92,7 @@ class DataSection (DataSectionClassObject):
|
||||
self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'
|
||||
|
||||
NoStrip = True
|
||||
if self.SecType in ('TE', 'PE32'):
|
||||
if self.SecType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):
|
||||
if self.KeepReloc is not None:
|
||||
NoStrip = self.KeepReloc
|
||||
|
||||
@@ -110,7 +110,7 @@ class DataSection (DataSectionClassObject):
|
||||
)
|
||||
self.SectFileName = StrippedFile
|
||||
|
||||
if self.SecType == 'TE':
|
||||
if self.SecType == BINARY_FILE_TYPE_TE:
|
||||
TeFile = os.path.join( OutputPath, ModuleName + 'Te.raw')
|
||||
GenFdsGlobalVariable.GenerateFirmwareImage(
|
||||
TeFile,
|
||||
|
@@ -96,13 +96,13 @@ class DepexSection (DepexSectionClassObject):
|
||||
|
||||
if self.DepexType == 'PEI_DEPEX_EXP':
|
||||
ModuleType = SUP_MODULE_PEIM
|
||||
SecType = 'PEI_DEPEX'
|
||||
SecType = BINARY_FILE_TYPE_PEI_DEPEX
|
||||
elif self.DepexType == 'DXE_DEPEX_EXP':
|
||||
ModuleType = SUP_MODULE_DXE_DRIVER
|
||||
SecType = 'DXE_DEPEX'
|
||||
SecType = BINARY_FILE_TYPE_DXE_DEPEX
|
||||
elif self.DepexType == 'SMM_DEPEX_EXP':
|
||||
ModuleType = SUP_MODULE_DXE_SMM_DRIVER
|
||||
SecType = 'SMM_DEPEX'
|
||||
SecType = BINARY_FILE_TYPE_SMM_DEPEX
|
||||
else:
|
||||
EdkLogger.error("GenFds", FORMAT_INVALID,
|
||||
"Depex type %s is not valid for module %s" % (self.DepexType, ModuleName))
|
||||
|
@@ -67,7 +67,7 @@ class EfiSection (EfiSectionClassObject):
|
||||
StringData = FfsInf.__ExtendMacro__(self.StringData)
|
||||
ModuleNameStr = FfsInf.__ExtendMacro__('$(MODULE_NAME)')
|
||||
NoStrip = True
|
||||
if FfsInf.ModuleType in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM) and SectionType in ('TE', 'PE32'):
|
||||
if FfsInf.ModuleType in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM) and SectionType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):
|
||||
if FfsInf.KeepReloc is not None:
|
||||
NoStrip = FfsInf.KeepReloc
|
||||
elif FfsInf.KeepRelocFromRule is not None:
|
||||
@@ -171,9 +171,9 @@ class EfiSection (EfiSectionClassObject):
|
||||
OutputFileList.append(OutputFile)
|
||||
|
||||
#
|
||||
# If Section Type is 'UI'
|
||||
# If Section Type is BINARY_FILE_TYPE_UI
|
||||
#
|
||||
elif SectionType == 'UI':
|
||||
elif SectionType == BINARY_FILE_TYPE_UI:
|
||||
|
||||
InfOverrideUiString = False
|
||||
if FfsInf.Ui is not None:
|
||||
@@ -242,7 +242,7 @@ class EfiSection (EfiSectionClassObject):
|
||||
File = GenFdsGlobalVariable.MacroExtend(File, Dict)
|
||||
|
||||
#Get PE Section alignment when align is set to AUTO
|
||||
if self.Alignment == 'Auto' and (SectionType == 'PE32' or SectionType == 'TE'):
|
||||
if self.Alignment == 'Auto' and (SectionType == BINARY_FILE_TYPE_PE32 or SectionType == BINARY_FILE_TYPE_TE):
|
||||
ImageObj = PeImageClass (File)
|
||||
if ImageObj.SectionAlignment < 0x400:
|
||||
Align = str (ImageObj.SectionAlignment)
|
||||
@@ -287,7 +287,7 @@ class EfiSection (EfiSectionClassObject):
|
||||
|
||||
"""For TE Section call GenFw to generate TE image"""
|
||||
|
||||
if SectionType == 'TE':
|
||||
if SectionType == BINARY_FILE_TYPE_TE:
|
||||
TeFile = os.path.join( OutputPath, ModuleName + 'Te.raw')
|
||||
GenFdsGlobalVariable.GenerateFirmwareImage(
|
||||
TeFile,
|
||||
|
@@ -27,6 +27,7 @@ from Common import EdkLogger
|
||||
from Common.BuildToolError import *
|
||||
from Common.Misc import SaveFileOnChange
|
||||
from GenFds import GenFds
|
||||
from Common.DataType import BINARY_FILE_TYPE_FV
|
||||
|
||||
## generate FD
|
||||
#
|
||||
@@ -158,7 +159,7 @@ class FD(FDClassObject):
|
||||
FvAddDict ={}
|
||||
FvList = []
|
||||
for RegionObj in self.RegionList:
|
||||
if RegionObj.RegionType == 'FV':
|
||||
if RegionObj.RegionType == BINARY_FILE_TYPE_FV:
|
||||
if len(RegionObj.RegionDataList) == 1:
|
||||
RegionData = RegionObj.RegionDataList[0]
|
||||
FvList.append(RegionData.upper())
|
||||
|
@@ -1843,7 +1843,7 @@ class FdfParser:
|
||||
if not self.__GetNextWord():
|
||||
return True
|
||||
|
||||
if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE", "INF"):
|
||||
if not self.__Token in ("SET", BINARY_FILE_TYPE_FV, "FILE", "DATA", "CAPSULE", "INF"):
|
||||
#
|
||||
# If next token is a word which is not a valid FV type, it might be part of [PcdOffset[|PcdSize]]
|
||||
# Or it might be next region's offset described by an expression which starts with a PCD.
|
||||
@@ -1874,7 +1874,7 @@ class FdfParser:
|
||||
if not self.__GetNextWord():
|
||||
return True
|
||||
|
||||
elif self.__Token == "FV":
|
||||
elif self.__Token == BINARY_FILE_TYPE_FV:
|
||||
self.__UndoToken()
|
||||
self.__GetRegionFvType( RegionObj)
|
||||
|
||||
@@ -1918,8 +1918,8 @@ class FdfParser:
|
||||
#
|
||||
def __GetRegionFvType(self, RegionObj):
|
||||
|
||||
if not self.__IsKeyword( "FV"):
|
||||
raise Warning("expected Keyword 'FV'", self.FileName, self.CurrentLineNumber)
|
||||
if not self.__IsKeyword( BINARY_FILE_TYPE_FV):
|
||||
raise Warning("expected Keyword BINARY_FILE_TYPE_FV", self.FileName, self.CurrentLineNumber)
|
||||
|
||||
if not self.__IsToken( "="):
|
||||
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
|
||||
@@ -1927,10 +1927,10 @@ class FdfParser:
|
||||
if not self.__GetNextToken():
|
||||
raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)
|
||||
|
||||
RegionObj.RegionType = "FV"
|
||||
RegionObj.RegionType = BINARY_FILE_TYPE_FV
|
||||
RegionObj.RegionDataList.append((self.__Token).upper())
|
||||
|
||||
while self.__IsKeyword( "FV"):
|
||||
while self.__IsKeyword( BINARY_FILE_TYPE_FV):
|
||||
|
||||
if not self.__IsToken( "="):
|
||||
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
|
||||
@@ -2528,7 +2528,7 @@ class FdfParser:
|
||||
if self.__GetStringData():
|
||||
FfsInfObj.Version = self.__Token
|
||||
|
||||
if self.__IsKeyword( "UI"):
|
||||
if self.__IsKeyword( BINARY_FILE_TYPE_UI):
|
||||
if not self.__IsToken( "="):
|
||||
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
|
||||
if not self.__GetNextToken():
|
||||
@@ -2641,7 +2641,7 @@ class FdfParser:
|
||||
#
|
||||
@staticmethod
|
||||
def __SectionCouldHaveRelocFlag (SectionType):
|
||||
if SectionType in ('TE', 'PE32'):
|
||||
if SectionType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
@@ -2674,7 +2674,7 @@ class FdfParser:
|
||||
if not self.__GetNextToken():
|
||||
raise Warning("expected File name or section data", self.FileName, self.CurrentLineNumber)
|
||||
|
||||
if self.__Token == "FV":
|
||||
if self.__Token == BINARY_FILE_TYPE_FV:
|
||||
if not self.__IsToken( "="):
|
||||
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)
|
||||
if not self.__GetNextToken():
|
||||
@@ -2881,7 +2881,7 @@ class FdfParser:
|
||||
VerSectionObj.FileName = self.__Token
|
||||
Obj.SectionList.append(VerSectionObj)
|
||||
|
||||
elif self.__IsKeyword( "UI"):
|
||||
elif self.__IsKeyword( BINARY_FILE_TYPE_UI):
|
||||
if AlignValue == 'Auto':
|
||||
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)
|
||||
if not self.__IsToken( "="):
|
||||
@@ -2965,10 +2965,10 @@ class FdfParser:
|
||||
self.SetFileBufferPos(OldPos)
|
||||
return False
|
||||
|
||||
if self.__Token not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\
|
||||
"UI", "VERSION", "PEI_DEPEX", "SUBTYPE_GUID", "SMM_DEPEX"):
|
||||
if self.__Token not in ("COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\
|
||||
BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, "SUBTYPE_GUID", BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)
|
||||
if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):
|
||||
if AlignValue == 'Auto'and (not self.__Token == BINARY_FILE_TYPE_PE32) and (not self.__Token == BINARY_FILE_TYPE_TE):
|
||||
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)
|
||||
|
||||
# DataSection
|
||||
@@ -3386,7 +3386,7 @@ class FdfParser:
|
||||
#
|
||||
def __GetFvStatement(self, CapsuleObj, FMPCapsule = False):
|
||||
|
||||
if not self.__IsKeyword("FV"):
|
||||
if not self.__IsKeyword(BINARY_FILE_TYPE_FV):
|
||||
return False
|
||||
|
||||
if not self.__IsToken("="):
|
||||
@@ -3534,7 +3534,7 @@ class FdfParser:
|
||||
AfileBaseName = os.path.basename(AfileName)
|
||||
|
||||
if os.path.splitext(AfileBaseName)[1] not in [".bin",".BIN",".Bin",".dat",".DAT",".Dat",".data",".DATA",".Data"]:
|
||||
raise Warning('invalid binary file type, should be one of "bin","BIN","Bin","dat","DAT","Dat","data","DATA","Data"', \
|
||||
raise Warning('invalid binary file type, should be one of "bin",BINARY_FILE_TYPE_BIN,"Bin","dat","DAT","Dat","data","DATA","Data"', \
|
||||
self.FileName, self.CurrentLineNumber)
|
||||
|
||||
if not os.path.isabs(AfileName):
|
||||
@@ -3767,8 +3767,8 @@ class FdfParser:
|
||||
|
||||
SectionName = self.__Token
|
||||
|
||||
if SectionName not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\
|
||||
"UI", "PEI_DEPEX", "VERSION", "SUBTYPE_GUID", "SMM_DEPEX"):
|
||||
if SectionName not in ("COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\
|
||||
BINARY_FILE_TYPE_UI, BINARY_FILE_TYPE_PEI_DEPEX, "VERSION", "SUBTYPE_GUID", BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
raise Warning("Unknown leaf section name '%s'" % SectionName, self.FileName, self.CurrentLineNumber)
|
||||
|
||||
|
||||
@@ -3783,7 +3783,7 @@ class FdfParser:
|
||||
if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",
|
||||
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):
|
||||
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)
|
||||
if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):
|
||||
if self.__Token == 'Auto' and (not SectionName == BINARY_FILE_TYPE_PE32) and (not SectionName == BINARY_FILE_TYPE_TE):
|
||||
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)
|
||||
SectAlignment = self.__Token
|
||||
|
||||
@@ -3824,8 +3824,8 @@ class FdfParser:
|
||||
return False
|
||||
SectionName = self.__Token
|
||||
|
||||
if SectionName not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\
|
||||
"UI", "VERSION", "PEI_DEPEX", "GUID", "SMM_DEPEX"):
|
||||
if SectionName not in ("COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\
|
||||
BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, BINARY_FILE_TYPE_GUID, BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
self.__UndoToken()
|
||||
return False
|
||||
|
||||
@@ -3855,8 +3855,8 @@ class FdfParser:
|
||||
FvImageSectionObj.FvName = None
|
||||
|
||||
else:
|
||||
if not self.__IsKeyword("FV"):
|
||||
raise Warning("expected 'FV'", self.FileName, self.CurrentLineNumber)
|
||||
if not self.__IsKeyword(BINARY_FILE_TYPE_FV):
|
||||
raise Warning("expected BINARY_FILE_TYPE_FV", self.FileName, self.CurrentLineNumber)
|
||||
FvImageSectionObj.FvFileType = self.__Token
|
||||
|
||||
if self.__GetAlignment():
|
||||
@@ -3868,8 +3868,8 @@ class FdfParser:
|
||||
if self.__IsToken('|'):
|
||||
FvImageSectionObj.FvFileExtension = self.__GetFileExtension()
|
||||
elif self.__GetNextToken():
|
||||
if self.__Token not in ("}", "COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\
|
||||
"UI", "VERSION", "PEI_DEPEX", "GUID", "SMM_DEPEX"):
|
||||
if self.__Token not in ("}", "COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\
|
||||
BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, BINARY_FILE_TYPE_GUID, BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
FvImageSectionObj.FvFileName = self.__Token
|
||||
else:
|
||||
self.__UndoToken()
|
||||
@@ -3931,7 +3931,7 @@ class FdfParser:
|
||||
if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",
|
||||
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):
|
||||
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)
|
||||
if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):
|
||||
if self.__Token == 'Auto' and (not SectionName == BINARY_FILE_TYPE_PE32) and (not SectionName == BINARY_FILE_TYPE_TE):
|
||||
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)
|
||||
EfiSectionObj.Alignment = self.__Token
|
||||
|
||||
@@ -3950,8 +3950,8 @@ class FdfParser:
|
||||
if self.__IsToken('|'):
|
||||
EfiSectionObj.FileExtension = self.__GetFileExtension()
|
||||
elif self.__GetNextToken():
|
||||
if self.__Token not in ("}", "COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\
|
||||
"UI", "VERSION", "PEI_DEPEX", "GUID", "SMM_DEPEX"):
|
||||
if self.__Token not in ("}", "COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\
|
||||
BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, BINARY_FILE_TYPE_GUID, BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
|
||||
if self.__Token.startswith('PCD'):
|
||||
self.__UndoToken()
|
||||
@@ -3985,7 +3985,7 @@ class FdfParser:
|
||||
#
|
||||
@staticmethod
|
||||
def __RuleSectionCouldBeOptional(SectionType):
|
||||
if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"):
|
||||
if SectionType in (BINARY_FILE_TYPE_DXE_DEPEX, BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, "RAW", BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
@@ -4015,7 +4015,7 @@ class FdfParser:
|
||||
#
|
||||
@staticmethod
|
||||
def __RuleSectionCouldHaveString(SectionType):
|
||||
if SectionType in ("UI", "VERSION"):
|
||||
if SectionType in (BINARY_FILE_TYPE_UI, "VERSION"):
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
@@ -4032,32 +4032,32 @@ class FdfParser:
|
||||
if SectionType == "COMPAT16":
|
||||
if FileType not in ("COMPAT16", "SEC_COMPAT16"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "PE32":
|
||||
if FileType not in ("PE32", "SEC_PE32"):
|
||||
elif SectionType == BINARY_FILE_TYPE_PE32:
|
||||
if FileType not in (BINARY_FILE_TYPE_PE32, "SEC_PE32"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "PIC":
|
||||
if FileType not in ("PIC", "PIC"):
|
||||
elif SectionType == BINARY_FILE_TYPE_PIC:
|
||||
if FileType not in (BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_PIC):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "TE":
|
||||
if FileType not in ("TE", "SEC_TE"):
|
||||
elif SectionType == BINARY_FILE_TYPE_TE:
|
||||
if FileType not in (BINARY_FILE_TYPE_TE, "SEC_TE"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "RAW":
|
||||
if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):
|
||||
if FileType not in (BINARY_FILE_TYPE_BIN, "SEC_BIN", "RAW", "ASL", "ACPI"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":
|
||||
if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):
|
||||
elif SectionType == BINARY_FILE_TYPE_DXE_DEPEX or SectionType == BINARY_FILE_TYPE_SMM_DEPEX:
|
||||
if FileType not in (BINARY_FILE_TYPE_DXE_DEPEX, "SEC_DXE_DEPEX", BINARY_FILE_TYPE_SMM_DEPEX):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "UI":
|
||||
if FileType not in ("UI", "SEC_UI"):
|
||||
elif SectionType == BINARY_FILE_TYPE_UI:
|
||||
if FileType not in (BINARY_FILE_TYPE_UI, "SEC_UI"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "VERSION":
|
||||
if FileType not in ("VERSION", "SEC_VERSION"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "PEI_DEPEX":
|
||||
if FileType not in ("PEI_DEPEX", "SEC_PEI_DEPEX"):
|
||||
elif SectionType == BINARY_FILE_TYPE_PEI_DEPEX:
|
||||
if FileType not in (BINARY_FILE_TYPE_PEI_DEPEX, "SEC_PEI_DEPEX"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
elif SectionType == "GUID":
|
||||
if FileType not in ("PE32", "SEC_GUID"):
|
||||
elif SectionType == BINARY_FILE_TYPE_GUID:
|
||||
if FileType not in (BINARY_FILE_TYPE_PE32, "SEC_GUID"):
|
||||
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)
|
||||
|
||||
## __GetRuleEncapsulationSection() method
|
||||
@@ -4494,7 +4494,7 @@ class FdfParser:
|
||||
|
||||
FfsFileObj = OptRomFileStatement.OptRomFileStatement()
|
||||
|
||||
if not self.__IsKeyword("EFI") and not self.__IsKeyword("BIN"):
|
||||
if not self.__IsKeyword("EFI") and not self.__IsKeyword(BINARY_FILE_TYPE_BIN):
|
||||
raise Warning("expected Binary type (EFI/BIN)", self.FileName, self.CurrentLineNumber)
|
||||
FfsFileObj.FileType = self.__Token
|
||||
|
||||
@@ -4575,7 +4575,7 @@ class FdfParser:
|
||||
if FdName.upper() in self.Profile.FdDict:
|
||||
FdObj = self.Profile.FdDict[FdName.upper()]
|
||||
for elementRegion in FdObj.RegionList:
|
||||
if elementRegion.RegionType == 'FV':
|
||||
if elementRegion.RegionType == BINARY_FILE_TYPE_FV:
|
||||
for elementRegionData in elementRegion.RegionDataList:
|
||||
if elementRegionData.endswith(".fv"):
|
||||
continue
|
||||
|
@@ -42,12 +42,12 @@ class Ffs(FDClassObject):
|
||||
|
||||
# mapping between section type in FDF and file suffix
|
||||
SectionSuffix = {
|
||||
'PE32' : '.pe32',
|
||||
'PIC' : '.pic',
|
||||
'TE' : '.te',
|
||||
'DXE_DEPEX' : '.dpx',
|
||||
BINARY_FILE_TYPE_PE32 : '.pe32',
|
||||
BINARY_FILE_TYPE_PIC : '.pic',
|
||||
BINARY_FILE_TYPE_TE : '.te',
|
||||
BINARY_FILE_TYPE_DXE_DEPEX : '.dpx',
|
||||
'VERSION' : '.ver',
|
||||
'UI' : '.ui',
|
||||
BINARY_FILE_TYPE_UI : '.ui',
|
||||
'COMPAT16' : '.com16',
|
||||
'RAW' : '.raw',
|
||||
'FREEFORM_SUBTYPE_GUID': '.guid',
|
||||
@@ -55,8 +55,8 @@ class Ffs(FDClassObject):
|
||||
'FV_IMAGE' : 'fv.sec',
|
||||
'COMPRESS' : '.com',
|
||||
'GUIDED' : '.guided',
|
||||
'PEI_DEPEX' : '.dpx',
|
||||
'SMM_DEPEX' : '.dpx'
|
||||
BINARY_FILE_TYPE_PEI_DEPEX : '.dpx',
|
||||
BINARY_FILE_TYPE_SMM_DEPEX : '.dpx'
|
||||
}
|
||||
|
||||
## The constructor
|
||||
|
@@ -381,7 +381,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
#
|
||||
# Only patch file if FileType is PE32 or ModuleType is USER_DEFINED
|
||||
#
|
||||
if FileType != 'PE32' and self.ModuleType != SUP_MODULE_USER_DEFINED:
|
||||
if FileType != BINARY_FILE_TYPE_PE32 and self.ModuleType != SUP_MODULE_USER_DEFINED:
|
||||
return EfiFile
|
||||
|
||||
#
|
||||
@@ -739,13 +739,13 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
# Convert Fv Section Type for PI1.1 SMM driver.
|
||||
#
|
||||
if self.ModuleType == SUP_MODULE_DXE_SMM_DRIVER and int(self.PiSpecVersion, 16) >= 0x0001000A:
|
||||
if SectionType == 'DXE_DEPEX':
|
||||
SectionType = 'SMM_DEPEX'
|
||||
if SectionType == BINARY_FILE_TYPE_DXE_DEPEX:
|
||||
SectionType = BINARY_FILE_TYPE_SMM_DEPEX
|
||||
#
|
||||
# Framework SMM Driver has no SMM_DEPEX section type
|
||||
#
|
||||
if self.ModuleType == SUP_MODULE_DXE_SMM_DRIVER and int(self.PiSpecVersion, 16) < 0x0001000A:
|
||||
if SectionType == 'SMM_DEPEX':
|
||||
if SectionType == BINARY_FILE_TYPE_SMM_DEPEX:
|
||||
EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "Framework SMM module doesn't support SMM_DEPEX section type", File=self.InfFileName)
|
||||
NoStrip = True
|
||||
if self.ModuleType in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM):
|
||||
@@ -767,7 +767,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
File = GenFdsGlobalVariable.MacroExtend(File, Dict, self.CurrentArch)
|
||||
|
||||
#Get PE Section alignment when align is set to AUTO
|
||||
if self.Alignment == 'Auto' and (SectionType == 'PE32' or SectionType == 'TE'):
|
||||
if self.Alignment == 'Auto' and (SectionType == BINARY_FILE_TYPE_PE32 or SectionType == BINARY_FILE_TYPE_TE):
|
||||
ImageObj = PeImageClass (File)
|
||||
if ImageObj.SectionAlignment < 0x400:
|
||||
self.Alignment = str (ImageObj.SectionAlignment)
|
||||
@@ -790,7 +790,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
)
|
||||
File = StrippedFile
|
||||
|
||||
if SectionType == 'TE':
|
||||
if SectionType == BINARY_FILE_TYPE_TE:
|
||||
TeFile = os.path.join( self.OutputPath, self.ModuleGuid + 'Te.raw')
|
||||
GenFdsGlobalVariable.GenerateFirmwareImage(
|
||||
TeFile,
|
||||
@@ -809,7 +809,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
GenSecInputFile = GenFdsGlobalVariable.MacroExtend(GenSecInputFile, Dict, self.CurrentArch)
|
||||
|
||||
#Get PE Section alignment when align is set to AUTO
|
||||
if self.Alignment == 'Auto' and (SectionType == 'PE32' or SectionType == 'TE'):
|
||||
if self.Alignment == 'Auto' and (SectionType == BINARY_FILE_TYPE_PE32 or SectionType == BINARY_FILE_TYPE_TE):
|
||||
ImageObj = PeImageClass (GenSecInputFile)
|
||||
if ImageObj.SectionAlignment < 0x400:
|
||||
self.Alignment = str (ImageObj.SectionAlignment)
|
||||
@@ -833,7 +833,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
)
|
||||
GenSecInputFile = StrippedFile
|
||||
|
||||
if SectionType == 'TE':
|
||||
if SectionType == BINARY_FILE_TYPE_TE:
|
||||
TeFile = os.path.join( self.OutputPath, self.ModuleGuid + 'Te.raw')
|
||||
GenFdsGlobalVariable.GenerateFirmwareImage(
|
||||
TeFile,
|
||||
@@ -942,13 +942,13 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
||||
# Convert Fv Section Type for PI1.1 SMM driver.
|
||||
#
|
||||
if self.ModuleType == SUP_MODULE_DXE_SMM_DRIVER and int(self.PiSpecVersion, 16) >= 0x0001000A:
|
||||
if Sect.SectionType == 'DXE_DEPEX':
|
||||
Sect.SectionType = 'SMM_DEPEX'
|
||||
if Sect.SectionType == BINARY_FILE_TYPE_DXE_DEPEX:
|
||||
Sect.SectionType = BINARY_FILE_TYPE_SMM_DEPEX
|
||||
#
|
||||
# Framework SMM Driver has no SMM_DEPEX section type
|
||||
#
|
||||
if self.ModuleType == SUP_MODULE_DXE_SMM_DRIVER and int(self.PiSpecVersion, 16) < 0x0001000A:
|
||||
if Sect.SectionType == 'SMM_DEPEX':
|
||||
if Sect.SectionType == BINARY_FILE_TYPE_SMM_DEPEX:
|
||||
EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "Framework SMM module doesn't support SMM_DEPEX section type", File=self.InfFileName)
|
||||
#
|
||||
# process the inside FvImage from FvSection or GuidSection
|
||||
|
@@ -29,6 +29,7 @@ from CommonDataClass.FdfClass import FvClassObject
|
||||
from Common.Misc import SaveFileOnChange
|
||||
from Common.LongFilePathSupport import CopyLongFilePath
|
||||
from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.DataType import *
|
||||
|
||||
T_CHAR_LF = '\n'
|
||||
FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C'
|
||||
@@ -80,7 +81,7 @@ class FV (FvClassObject):
|
||||
if self.CapsuleName is not None:
|
||||
for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():
|
||||
for RegionObj in FdObj.RegionList:
|
||||
if RegionObj.RegionType == 'FV':
|
||||
if RegionObj.RegionType == BINARY_FILE_TYPE_FV:
|
||||
for RegionData in RegionObj.RegionDataList:
|
||||
if RegionData.endswith(".fv"):
|
||||
continue
|
||||
@@ -236,7 +237,7 @@ class FV (FvClassObject):
|
||||
|
||||
for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():
|
||||
for RegionObj in FdObj.RegionList:
|
||||
if RegionObj.RegionType != 'FV':
|
||||
if RegionObj.RegionType != BINARY_FILE_TYPE_FV:
|
||||
continue
|
||||
for RegionData in RegionObj.RegionDataList:
|
||||
#
|
||||
|
@@ -315,7 +315,7 @@ def main():
|
||||
for Fd in FdfParserObj.Profile.FdDict:
|
||||
FdObj = FdfParserObj.Profile.FdDict[Fd]
|
||||
for RegionObj in FdObj.RegionList:
|
||||
if RegionObj.RegionType != 'FV':
|
||||
if RegionObj.RegionType != BINARY_FILE_TYPE_FV:
|
||||
continue
|
||||
for RegionData in RegionObj.RegionDataList:
|
||||
if FvObj.UiFvName.upper() == RegionData.upper():
|
||||
@@ -405,7 +405,7 @@ def FindExtendTool(KeyStringList, CurrentArchList, NameGuid):
|
||||
KeyList[1] + \
|
||||
'_' + \
|
||||
KeyList[2]
|
||||
if Key in KeyStringList and KeyList[4] == 'GUID':
|
||||
if Key in KeyStringList and KeyList[4] == TAB_GUID:
|
||||
ToolPathKey = Key + '_' + KeyList[3] + '_PATH'
|
||||
ToolOptionKey = Key + '_' + KeyList[3] + '_FLAGS'
|
||||
ToolPath = ToolDefinition.get(ToolPathKey)
|
||||
@@ -447,7 +447,7 @@ def FindExtendTool(KeyStringList, CurrentArchList, NameGuid):
|
||||
if NameGuid == BuildOption[Op]:
|
||||
KeyList = Op.split('_')
|
||||
Key = KeyList[0] + '_' + KeyList[1] +'_' + KeyList[2]
|
||||
if Key in KeyStringList and KeyList[4] == 'GUID':
|
||||
if Key in KeyStringList and KeyList[4] == TAB_GUID:
|
||||
ToolPathKey = Key + '_' + KeyList[3] + '_PATH'
|
||||
ToolOptionKey = Key + '_' + KeyList[3] + '_FLAGS'
|
||||
if ToolPathKey in BuildOption:
|
||||
@@ -589,7 +589,7 @@ class GenFds :
|
||||
if FdObj is None:
|
||||
for ElementFd in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():
|
||||
for ElementRegion in ElementFd.RegionList:
|
||||
if ElementRegion.RegionType == 'FV':
|
||||
if ElementRegion.RegionType == BINARY_FILE_TYPE_FV:
|
||||
for ElementRegionData in ElementRegion.RegionDataList:
|
||||
if ElementRegionData is not None and ElementRegionData.upper() == FvObj.UiFvName:
|
||||
if FvObj.BlockSizeList != []:
|
||||
@@ -601,7 +601,7 @@ class GenFds :
|
||||
return DefaultBlockSize
|
||||
else:
|
||||
for ElementRegion in FdObj.RegionList:
|
||||
if ElementRegion.RegionType == 'FV':
|
||||
if ElementRegion.RegionType == BINARY_FILE_TYPE_FV:
|
||||
for ElementRegionData in ElementRegion.RegionDataList:
|
||||
if ElementRegionData is not None and ElementRegionData.upper() == FvObj.UiFvName:
|
||||
if FvObj.BlockSizeList != []:
|
||||
|
@@ -288,7 +288,7 @@ class GenFdsGlobalVariable:
|
||||
# GenFdsGlobalVariable.OutputDirDict = OutputDir
|
||||
GenFdsGlobalVariable.FdfParser = FdfParser
|
||||
GenFdsGlobalVariable.WorkSpace = WorkSpace
|
||||
GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], 'FV')
|
||||
GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], DataType.TAB_FV_DIRECTORY)
|
||||
if not os.path.exists(GenFdsGlobalVariable.FvDir) :
|
||||
os.makedirs(GenFdsGlobalVariable.FvDir)
|
||||
GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')
|
||||
@@ -349,7 +349,7 @@ class GenFdsGlobalVariable:
|
||||
GenFdsGlobalVariable.PlatformName = WorkSpace.Db.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch,
|
||||
GlobalData.gGlobalDefines['TARGET'],
|
||||
GlobalData.gGlobalDefines['TOOLCHAIN']].PlatformName
|
||||
GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], 'FV')
|
||||
GenFdsGlobalVariable.FvDir = os.path.join(GenFdsGlobalVariable.OutputDirDict[ArchList[0]], DataType.TAB_FV_DIRECTORY)
|
||||
if not os.path.exists(GenFdsGlobalVariable.FvDir):
|
||||
os.makedirs(GenFdsGlobalVariable.FvDir)
|
||||
GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')
|
||||
|
@@ -141,7 +141,7 @@ class OptRomInfStatement (FfsInfStatement):
|
||||
|
||||
OutputFileList = []
|
||||
for Sect in Rule.SectionList:
|
||||
if Sect.SectionType == 'PE32':
|
||||
if Sect.SectionType == BINARY_FILE_TYPE_PE32:
|
||||
if Sect.FileName is not None:
|
||||
GenSecInputFile = self.__ExtendMacro__(Sect.FileName)
|
||||
OutputFileList.append(GenSecInputFile)
|
||||
|
@@ -26,6 +26,7 @@ from Common import EdkLogger
|
||||
from Common.BuildToolError import *
|
||||
from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.MultipleWorkspace import MultipleWorkspace as mws
|
||||
from Common.DataType import BINARY_FILE_TYPE_FV
|
||||
|
||||
## generate Region
|
||||
#
|
||||
@@ -80,10 +81,10 @@ class Region(RegionClassObject):
|
||||
GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)
|
||||
GenFdsGlobalVariable.InfLogger(" Region Size = 0x%X" % Size)
|
||||
GenFdsGlobalVariable.SharpCounter = 0
|
||||
if Flag and (self.RegionType != 'FV'):
|
||||
if Flag and (self.RegionType != BINARY_FILE_TYPE_FV):
|
||||
return
|
||||
|
||||
if self.RegionType == 'FV':
|
||||
if self.RegionType == BINARY_FILE_TYPE_FV:
|
||||
#
|
||||
# Get Fv from FvDict
|
||||
#
|
||||
|
@@ -20,7 +20,7 @@ from GenFdsGlobalVariable import GenFdsGlobalVariable
|
||||
import Common.LongFilePathOs as os, glob
|
||||
from Common import EdkLogger
|
||||
from Common.BuildToolError import *
|
||||
from Common.DataType import TAB_ARCH_COMMON
|
||||
from Common.DataType import *
|
||||
|
||||
## section base class
|
||||
#
|
||||
@@ -29,37 +29,37 @@ class Section (SectionClassObject):
|
||||
SectionType = {
|
||||
'RAW' : 'EFI_SECTION_RAW',
|
||||
'FREEFORM' : 'EFI_SECTION_FREEFORM_SUBTYPE_GUID',
|
||||
'PE32' : 'EFI_SECTION_PE32',
|
||||
'PIC' : 'EFI_SECTION_PIC',
|
||||
'TE' : 'EFI_SECTION_TE',
|
||||
BINARY_FILE_TYPE_PE32 : 'EFI_SECTION_PE32',
|
||||
BINARY_FILE_TYPE_PIC : 'EFI_SECTION_PIC',
|
||||
BINARY_FILE_TYPE_TE : 'EFI_SECTION_TE',
|
||||
'FV_IMAGE' : 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE',
|
||||
'DXE_DEPEX' : 'EFI_SECTION_DXE_DEPEX',
|
||||
'PEI_DEPEX' : 'EFI_SECTION_PEI_DEPEX',
|
||||
BINARY_FILE_TYPE_DXE_DEPEX : 'EFI_SECTION_DXE_DEPEX',
|
||||
BINARY_FILE_TYPE_PEI_DEPEX : 'EFI_SECTION_PEI_DEPEX',
|
||||
'GUIDED' : 'EFI_SECTION_GUID_DEFINED',
|
||||
'COMPRESS' : 'EFI_SECTION_COMPRESSION',
|
||||
'UI' : 'EFI_SECTION_USER_INTERFACE',
|
||||
'SMM_DEPEX' : 'EFI_SECTION_SMM_DEPEX'
|
||||
BINARY_FILE_TYPE_UI : 'EFI_SECTION_USER_INTERFACE',
|
||||
BINARY_FILE_TYPE_SMM_DEPEX : 'EFI_SECTION_SMM_DEPEX'
|
||||
}
|
||||
|
||||
BinFileType = {
|
||||
'GUID' : '.guid',
|
||||
BINARY_FILE_TYPE_GUID : '.guid',
|
||||
'ACPI' : '.acpi',
|
||||
'ASL' : '.asl' ,
|
||||
'UEFI_APP' : '.app',
|
||||
'LIB' : '.lib',
|
||||
'PE32' : '.pe32',
|
||||
'PIC' : '.pic',
|
||||
'PEI_DEPEX' : '.depex',
|
||||
BINARY_FILE_TYPE_UEFI_APP : '.app',
|
||||
BINARY_FILE_TYPE_LIB : '.lib',
|
||||
BINARY_FILE_TYPE_PE32 : '.pe32',
|
||||
BINARY_FILE_TYPE_PIC : '.pic',
|
||||
BINARY_FILE_TYPE_PEI_DEPEX : '.depex',
|
||||
'SEC_PEI_DEPEX' : '.depex',
|
||||
'TE' : '.te',
|
||||
'UNI_VER' : '.ver',
|
||||
'VER' : '.ver',
|
||||
'UNI_UI' : '.ui',
|
||||
'UI' : '.ui',
|
||||
'BIN' : '.bin',
|
||||
BINARY_FILE_TYPE_TE : '.te',
|
||||
BINARY_FILE_TYPE_UNI_VER : '.ver',
|
||||
BINARY_FILE_TYPE_VER : '.ver',
|
||||
BINARY_FILE_TYPE_UNI_UI : '.ui',
|
||||
BINARY_FILE_TYPE_UI : '.ui',
|
||||
BINARY_FILE_TYPE_BIN : '.bin',
|
||||
'RAW' : '.raw',
|
||||
'COMPAT16' : '.comp16',
|
||||
'FV' : '.fv'
|
||||
BINARY_FILE_TYPE_FV : '.fv'
|
||||
}
|
||||
|
||||
SectFileType = {
|
||||
@@ -128,8 +128,8 @@ class Section (SectionClassObject):
|
||||
for File in FfsInf.BinFileList:
|
||||
if File.Arch == TAB_ARCH_COMMON or FfsInf.CurrentArch == File.Arch:
|
||||
if File.Type == FileType or (int(FfsInf.PiSpecVersion, 16) >= 0x0001000A \
|
||||
and FileType == 'DXE_DPEX'and File.Type == 'SMM_DEPEX') \
|
||||
or (FileType == 'TE'and File.Type == 'PE32'):
|
||||
and FileType == 'DXE_DPEX' and File.Type == BINARY_FILE_TYPE_SMM_DEPEX) \
|
||||
or (FileType == BINARY_FILE_TYPE_TE and File.Type == BINARY_FILE_TYPE_PE32):
|
||||
if '*' in FfsInf.TargetOverrideList or File.Target == '*' or File.Target in FfsInf.TargetOverrideList or FfsInf.TargetOverrideList == []:
|
||||
FileList.append(FfsInf.PatchEfiFile(File.Path, File.Type))
|
||||
else:
|
||||
|
@@ -22,7 +22,7 @@ import Common.LongFilePathOs as os
|
||||
from GenFdsGlobalVariable import GenFdsGlobalVariable
|
||||
from CommonDataClass.FdfClass import UiSectionClassObject
|
||||
from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||
from Common.DataType import SUP_MODULE_SEC
|
||||
from Common.DataType import *
|
||||
|
||||
## generate UI section
|
||||
#
|
||||
@@ -58,7 +58,7 @@ class UiSection (UiSectionClassObject):
|
||||
self.StringData = FfsInf.__ExtendMacro__(self.StringData)
|
||||
self.FileName = FfsInf.__ExtendMacro__(self.FileName)
|
||||
|
||||
OutputFile = os.path.join(OutputPath, ModuleName + SUP_MODULE_SEC + SecNum + Ffs.SectionSuffix.get('UI'))
|
||||
OutputFile = os.path.join(OutputPath, ModuleName + SUP_MODULE_SEC + SecNum + Ffs.SectionSuffix.get(BINARY_FILE_TYPE_UI))
|
||||
|
||||
if self.StringData is not None :
|
||||
NameString = self.StringData
|
||||
|
Reference in New Issue
Block a user