BaseTools: Replace Binary File type strings with predefined constant

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / AutoGen.py

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 2a6fa05ab819a04f443b1b37725db030e285d15b..671f02133aca3ebf44d07e2571d5bc7e7483f504 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -922,7 +922,7 @@ class WorkspaceAutoGen(AutoGen):
     ## Return the directory to store FV files\r
     def _GetFvDir(self):\r
         if self._FvDir is None:\r
-            self._FvDir = path.join(self.BuildDir, 'FV')\r
+            self._FvDir = path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
         return self._FvDir\r
 \r
     ## Return the directory to store all intermediate and final files built\r
@@ -1325,7 +1325,7 @@ class PlatformAutoGen(AutoGen):
 \r
     def UpdateNVStoreMaxSize(self,OrgVpdFile):\r
         if self.VariableInfo:\r
-            VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)\r
+            VpdMapFilePath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY, "%s.map" % self.Platform.VpdToolGuid)\r
             PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if item.TokenCName == "PcdNvStoreDefaultValueBuffer" and item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]\r
 \r
             if PcdNvStoreDfBuffer:\r
@@ -1718,7 +1718,7 @@ class PlatformAutoGen(AutoGen):
 \r
                 # Process VPD map file generated by third party BPDG tool\r
                 if NeedProcessVpdMapFile:\r
-                    VpdMapFilePath = os.path.join(self.BuildDir, "FV", "%s.map" % self.Platform.VpdToolGuid)\r
+                    VpdMapFilePath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY, "%s.map" % self.Platform.VpdToolGuid)\r
                     if os.path.exists(VpdMapFilePath):\r
                         VpdFile.Read(VpdMapFilePath)\r
 \r
@@ -1769,7 +1769,7 @@ class PlatformAutoGen(AutoGen):
         self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList\r
 \r
     def FixVpdOffset(self,VpdFile ):\r
-        FvPath = os.path.join(self.BuildDir, "FV")\r
+        FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
         if not os.path.exists(FvPath):\r
             try:\r
                 os.makedirs(FvPath)\r
@@ -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.\r
             BPDGToolName = None\r
             for ToolDef in self.ToolDefinition.values():\r
-                if ToolDef.has_key("GUID") and ToolDef["GUID"] == self.Platform.VpdToolGuid:\r
+                if ToolDef.has_key(TAB_GUID) and ToolDef[TAB_GUID] == self.Platform.VpdToolGuid:\r
                     if not ToolDef.has_key("PATH"):\r
                         EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE, "PATH attribute was not provided for BPDG guid tool %s in tools_def.txt" % self.Platform.VpdToolGuid)\r
                     BPDGToolName = ToolDef["PATH"]\r
@@ -3031,7 +3031,7 @@ class ModuleAutoGen(AutoGen):
     def _GetFfsOutputDir(self):\r
         if self._FfsOutputDir is None:\r
             if GlobalData.gFdfParser is not None:\r
-                self._FfsOutputDir = path.join(self.PlatformInfo.BuildDir, "FV", "Ffs", self.Guid + self.Name)\r
+                self._FfsOutputDir = path.join(self.PlatformInfo.BuildDir, TAB_FV_DIRECTORY, "Ffs", self.Guid + self.Name)\r
             else:\r
                 self._FfsOutputDir = ''\r
         return self._FfsOutputDir\r