BaseTools: replace string constants used for module types

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FvImageSection.py

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index 68f17c31e8be27207564e330435096b38b423b5c..eb84b44bbec49316e1a6d0c3258ef230529f2207 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -24,6 +24,7 @@ import Common.LongFilePathOs as os
 from CommonDataClass.FdfClass import FvImageSectionClassObject\r
 from Common import EdkLogger\r
 from Common.BuildToolError import *\r
+from Common.DataType import *\r
 \r
 ## generate FV image section\r
 #\r
@@ -50,10 +51,10 @@ class FvImageSection(FvImageSectionClassObject):
     #   @param  Dict        dictionary contains macro and its value\r
     #   @retval tuple       (Generated file name, section alignment)\r
     #\r
-    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}):\r
+    def GenSection(self, OutputPath, ModuleName, SecNum, KeyStringList, FfsInf = None, Dict = {}, IsMakefile = False):\r
 \r
         OutputFileList = []\r
-        if self.FvFileType != None:\r
+        if self.FvFileType is not None:\r
             FileList, IsSect = Section.Section.GetFileList(FfsInf, self.FvFileType, self.FvFileExtension)\r
             if IsSect :\r
                 return FileList, self.Alignment\r
@@ -74,8 +75,8 @@ class FvImageSection(FvImageSectionClassObject):
                 if FvAlignmentValue > MaxFvAlignment:\r
                     MaxFvAlignment = FvAlignmentValue\r
 \r
-                OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + Num + Ffs.SectionSuffix.get("FV_IMAGE"))\r
-                GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')\r
+                OutputFile = os.path.join(OutputPath, ModuleName + SUP_MODULE_SEC + Num + Ffs.SectionSuffix.get("FV_IMAGE"))\r
+                GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE', IsMakefile=IsMakefile)\r
                 OutputFileList.append(OutputFile)\r
 \r
             # MaxFvAlignment is larger than or equal to 1K\r
@@ -96,20 +97,20 @@ class FvImageSection(FvImageSectionClassObject):
         #\r
         # Generate Fv\r
         #\r
-        if self.FvName != None:\r
+        if self.FvName is not None:\r
             Buffer = StringIO.StringIO('')\r
             Fv = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(self.FvName)\r
-            if Fv != None:\r
+            if Fv is not None:\r
                 self.Fv = Fv\r
-                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict)\r
-                if Fv.FvAlignment != None:\r
-                    if self.Alignment == None:\r
+                FvFileName = Fv.AddToBuffer(Buffer, self.FvAddr, MacroDict = Dict, Flag=IsMakefile)\r
+                if Fv.FvAlignment is not None:\r
+                    if self.Alignment is None:\r
                         self.Alignment = Fv.FvAlignment\r
                     else:\r
                         if GenFdsGlobalVariable.GetAlignment (Fv.FvAlignment) > GenFdsGlobalVariable.GetAlignment (self.Alignment):\r
                             self.Alignment = Fv.FvAlignment\r
             else:\r
-                if self.FvFileName != None:\r
+                if self.FvFileName is not None:\r
                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)\r
                     if os.path.isfile(FvFileName):\r
                         FvFileObj = open (FvFileName,'rb')\r
@@ -138,8 +139,8 @@ class FvImageSection(FvImageSectionClassObject):
             #\r
             # Prepare the parameter of GenSection\r
             #\r
-            OutputFile = os.path.join(OutputPath, ModuleName + 'SEC' + SecNum + Ffs.SectionSuffix.get("FV_IMAGE"))\r
-            GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE')\r
+            OutputFile = os.path.join(OutputPath, ModuleName + SUP_MODULE_SEC + SecNum + Ffs.SectionSuffix.get("FV_IMAGE"))\r
+            GenFdsGlobalVariable.GenerateSection(OutputFile, [FvFileName], 'EFI_SECTION_FIRMWARE_VOLUME_IMAGE', IsMakefile=IsMakefile)\r
             OutputFileList.append(OutputFile)\r
 \r
             return OutputFileList, self.Alignment\r