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
@@ -922,7 +922,7 @@ class WorkspaceAutoGen(AutoGen):
|
||||
## Return the directory to store FV files
|
||||
def _GetFvDir(self):
|
||||
if self._FvDir is None:
|
||||
self._FvDir = path.join(self.BuildDir, 'FV')
|
||||
self._FvDir = path.join(self.BuildDir, TAB_FV_DIRECTORY)
|
||||
return self._FvDir
|
||||
|
||||
## Return the directory to store all intermediate and final files built
|
||||
@@ -1325,7 +1325,7 @@ class PlatformAutoGen(AutoGen):
|
||||
|
||||
def UpdateNVStoreMaxSize(self,OrgVpdFile):
|
||||
if self.VariableInfo:
|
||||
VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)
|
||||
VpdMapFilePath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY, "%s.map" % self.Platform.VpdToolGuid)
|
||||
PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if item.TokenCName == "PcdNvStoreDefaultValueBuffer" and item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]
|
||||
|
||||
if PcdNvStoreDfBuffer:
|
||||
@@ -1718,7 +1718,7 @@ class PlatformAutoGen(AutoGen):
|
||||
|
||||
# Process VPD map file generated by third party BPDG tool
|
||||
if NeedProcessVpdMapFile:
|
||||
VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)
|
||||
VpdMapFilePath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY, "%s.map" % self.Platform.VpdToolGuid)
|
||||
if os.path.exists(VpdMapFilePath):
|
||||
VpdFile.Read(VpdMapFilePath)
|
||||
|
||||
@@ -1769,7 +1769,7 @@ class PlatformAutoGen(AutoGen):
|
||||
self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList
|
||||
|
||||
def FixVpdOffset(self,VpdFile ):
|
||||
FvPath = os.path.join(self.BuildDir, "FV")
|
||||
FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY)
|
||||
if not os.path.exists(FvPath):
|
||||
try:
|
||||
os.makedirs(FvPath)
|
||||
@@ -1782,7 +1782,7 @@ class PlatformAutoGen(AutoGen):
|
||||
# retrieve BPDG tool's path from tool_def.txt according to VPD_TOOL_GUID defined in DSC file.
|
||||
BPDGToolName = None
|
||||
for ToolDef in self.ToolDefinition.values():
|
||||
if ToolDef.has_key("GUID") and ToolDef["GUID"] == self.Platform.VpdToolGuid:
|
||||
if ToolDef.has_key(TAB_GUID) and ToolDef[TAB_GUID] == self.Platform.VpdToolGuid:
|
||||
if not ToolDef.has_key("PATH"):
|
||||
EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "PATH attribute was not provided for BPDG guid tool %s in tools_def.txt" % self.Platform.VpdToolGuid)
|
||||
BPDGToolName = ToolDef["PATH"]
|
||||
@@ -3031,7 +3031,7 @@ class ModuleAutoGen(AutoGen):
|
||||
def _GetFfsOutputDir(self):
|
||||
if self._FfsOutputDir is None:
|
||||
if GlobalData.gFdfParser is not None:
|
||||
self._FfsOutputDir = path.join(self.PlatformInfo.BuildDir, "FV", "Ffs", self.Guid + self.Name)
|
||||
self._FfsOutputDir = path.join(self.PlatformInfo.BuildDir, TAB_FV_DIRECTORY, "Ffs", self.Guid + self.Name)
|
||||
else:
|
||||
self._FfsOutputDir = ''
|
||||
return self._FfsOutputDir
|
||||
|
@@ -1613,7 +1613,7 @@ def CreateModuleUnloadImageCode(Info, AutoGenC, AutoGenH):
|
||||
#
|
||||
def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):
|
||||
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:
|
||||
GuidType = "GUID"
|
||||
GuidType = TAB_GUID
|
||||
else:
|
||||
GuidType = "EFI_GUID"
|
||||
|
||||
@@ -1637,7 +1637,7 @@ def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):
|
||||
#
|
||||
def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):
|
||||
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:
|
||||
GuidType = "GUID"
|
||||
GuidType = TAB_GUID
|
||||
else:
|
||||
GuidType = "EFI_GUID"
|
||||
|
||||
@@ -1661,7 +1661,7 @@ def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):
|
||||
#
|
||||
def CreatePpiDefinitionCode(Info, AutoGenC, AutoGenH):
|
||||
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:
|
||||
GuidType = "GUID"
|
||||
GuidType = TAB_GUID
|
||||
else:
|
||||
GuidType = "EFI_GUID"
|
||||
|
||||
@@ -1698,7 +1698,7 @@ def CreatePcdCode(Info, AutoGenC, AutoGenH):
|
||||
if TokenSpaceList:
|
||||
AutoGenH.Append("\n// Definition of PCD Token Space GUIDs used in this module\n\n")
|
||||
if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:
|
||||
GuidType = "GUID"
|
||||
GuidType = TAB_GUID
|
||||
else:
|
||||
GuidType = "EFI_GUID"
|
||||
for Item in TokenSpaceList:
|
||||
|
@@ -972,7 +972,7 @@ def CreatePcdDatabaseCode (Info, AutoGenC, AutoGenH):
|
||||
AutoGenC.Append(AdditionalAutoGenC.String)
|
||||
|
||||
if Info.IsBinaryModule:
|
||||
DbFileName = os.path.join(Info.PlatformInfo.BuildDir, "FV", Phase + "PcdDataBase.raw")
|
||||
DbFileName = os.path.join(Info.PlatformInfo.BuildDir, TAB_FV_DIRECTORY, Phase + "PcdDataBase.raw")
|
||||
else:
|
||||
DbFileName = os.path.join(Info.OutputDir, Phase + "PcdDataBase.raw")
|
||||
DbFile = StringIO()
|
||||
@@ -1054,7 +1054,7 @@ def NewCreatePcdDatabasePhaseSpecificAutoGen(Platform,Phase):
|
||||
PcdDriverAutoGenData[(skuname,skuid)] = (AdditionalAutoGenH, AdditionalAutoGenC)
|
||||
VarCheckTableData[(skuname,skuid)] = VarCheckTab
|
||||
if Platform.Platform.VarCheckFlag:
|
||||
dest = os.path.join(Platform.BuildDir, 'FV')
|
||||
dest = os.path.join(Platform.BuildDir, TAB_FV_DIRECTORY)
|
||||
VarCheckTable = CreateVarCheckBin(VarCheckTableData)
|
||||
VarCheckTable.dump(dest, Phase)
|
||||
AdditionalAutoGenH, AdditionalAutoGenC = CreateAutoGen(PcdDriverAutoGenData)
|
||||
|
Reference in New Issue
Block a user