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>

1 files changed, 5 insertions, 5 deletions

diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py
index 1be23b4bf7..5405d0a8da 100644
--- a/BaseTools/Source/Python/GenFds/EfiSection.py
+++ b/BaseTools/Source/Python/GenFds/EfiSection.py
@@ -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,