BaseTools: Move OverrideAttribs to OptRomInfStatement.py

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

diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
index d64f836164863fc2a1f9b5ce23131fab0def2897..e416b838d1e45b354bbdd0a60f354d0ed96a7dd4 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process OptionROM generation from INF statement\r
 #\r
-#  Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -15,18 +15,18 @@
 ##\r
 # Import Modules\r
 #\r
-import RuleSimpleFile\r
-import RuleComplexFile\r
-import Section\r
-import OptionRom\r
+from __future__ import absolute_import\r
+from . import RuleSimpleFile\r
+from . import RuleComplexFile\r
+from . import Section\r
 import Common.GlobalData as GlobalData\r
 \r
 from Common.DataType import *\r
-from Common.String import *\r
-from FfsInfStatement import FfsInfStatement\r
-from GenFdsGlobalVariable import GenFdsGlobalVariable\r
+from Common.StringUtils import *\r
+from .FfsInfStatement import FfsInfStatement\r
+from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
 \r
-## \r
+##\r
 #\r
 #\r
 class OptRomInfStatement (FfsInfStatement):\r
@@ -45,35 +45,34 @@ class OptRomInfStatement (FfsInfStatement):
     #   @param  self        The object pointer\r
     #\r
     def __GetOptRomParams(self):\r
-        \r
-        if self.OverrideAttribs == None:\r
-            self.OverrideAttribs = OptionRom.OverrideAttribs()\r
+        if self.OverrideAttribs is None:\r
+            self.OverrideAttribs = OverrideAttribs()\r
 \r
-        if self.OverrideAttribs.NeedCompress == None:\r
-            self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('COMPRESS')\r
+        if self.OverrideAttribs.NeedCompress is None:\r
+            self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('PCI_COMPRESS')\r
             if self.OverrideAttribs.NeedCompress is not None:\r
                 if self.OverrideAttribs.NeedCompress.upper() not in ('TRUE', 'FALSE'):\r
-                    GenFdsGlobalVariable.ErrorLogger( "Expected TRUE/FALSE for COMPRESS: %s" %self.InfFileName)\r
+                    GenFdsGlobalVariable.ErrorLogger( "Expected TRUE/FALSE for PCI_COMPRESS: %s" %self.InfFileName)\r
                 self.OverrideAttribs.NeedCompress = \\r
                     self.OverrideAttribs.NeedCompress.upper() == 'TRUE'\r
 \r
-        if self.OverrideAttribs.PciVendorId == None:\r
+        if self.OverrideAttribs.PciVendorId is None:\r
             self.OverrideAttribs.PciVendorId = self.OptRomDefs.get ('PCI_VENDOR_ID')\r
-        \r
-        if self.OverrideAttribs.PciClassCode == None:\r
+\r
+        if self.OverrideAttribs.PciClassCode is None:\r
             self.OverrideAttribs.PciClassCode = self.OptRomDefs.get ('PCI_CLASS_CODE')\r
-            \r
-        if self.OverrideAttribs.PciDeviceId == None:\r
+\r
+        if self.OverrideAttribs.PciDeviceId is None:\r
             self.OverrideAttribs.PciDeviceId = self.OptRomDefs.get ('PCI_DEVICE_ID')\r
-            \r
-        if self.OverrideAttribs.PciRevision == None:\r
+\r
+        if self.OverrideAttribs.PciRevision is None:\r
             self.OverrideAttribs.PciRevision = self.OptRomDefs.get ('PCI_REVISION')\r
-        \r
-#        InfObj = GenFdsGlobalVariable.WorkSpace.BuildObject[self.PathClassObj, self.CurrentArch]  \r
+\r
+#        InfObj = GenFdsGlobalVariable.WorkSpace.BuildObject[self.PathClassObj, self.CurrentArch]\r
 #        RecordList = InfObj._RawData[MODEL_META_DATA_HEADER, InfObj._Arch, InfObj._Platform]\r
 #        for Record in RecordList:\r
 #            Record = ReplaceMacros(Record, GlobalData.gEdkGlobal, False)\r
-#            Name = Record[0]  \r
+#            Name = Record[0]\r
     ## GenFfs() method\r
     #\r
     #   Generate FFS\r
@@ -81,7 +80,7 @@ class OptRomInfStatement (FfsInfStatement):
     #   @param  self        The object pointer\r
     #   @retval string      Generated .efi file name\r
     #\r
-    def GenFfs(self):\r
+    def GenFfs(self, IsMakefile=False):\r
         #\r
         # Parse Inf file get Module related information\r
         #\r
@@ -93,18 +92,17 @@ class OptRomInfStatement (FfsInfStatement):
         #\r
         Rule = self.__GetRule__()\r
         GenFdsGlobalVariable.VerboseLogger( "Packing binaries from inf file : %s" %self.InfFileName)\r
-        #FileType = Ffs.Ffs.ModuleTypeToFileType[Rule.ModuleType]\r
         #\r
         # For the rule only has simpleFile\r
         #\r
         if isinstance (Rule, RuleSimpleFile.RuleSimpleFile) :\r
-            EfiOutputList = self.__GenSimpleFileSection__(Rule)\r
+            EfiOutputList = self.__GenSimpleFileSection__(Rule, IsMakefile=IsMakefile)\r
             return EfiOutputList\r
         #\r
         # For Rule has ComplexFile\r
         #\r
         elif isinstance(Rule, RuleComplexFile.RuleComplexFile):\r
-            EfiOutputList = self.__GenComplexFileSection__(Rule)\r
+            EfiOutputList = self.__GenComplexFileSection__(Rule, IsMakefile=IsMakefile)\r
             return EfiOutputList\r
 \r
     ## __GenSimpleFileSection__() method\r
@@ -115,13 +113,13 @@ class OptRomInfStatement (FfsInfStatement):
     #   @param  Rule        The rule object used to generate section\r
     #   @retval string      File name of the generated section file\r
     #\r
-    def __GenSimpleFileSection__(self, Rule):\r
+    def __GenSimpleFileSection__(self, Rule, IsMakefile = False):\r
         #\r
         # Prepare the parameter of GenSection\r
         #\r
 \r
         OutputFileList = []\r
-        if Rule.FileName != None:\r
+        if Rule.FileName is not None:\r
             GenSecInputFile = self.__ExtendMacro__(Rule.FileName)\r
             OutputFileList.append(GenSecInputFile)\r
         else:\r
@@ -138,18 +136,30 @@ class OptRomInfStatement (FfsInfStatement):
     #   @param  Rule        The rule object used to generate section\r
     #   @retval string      File name of the generated section file\r
     #\r
-    def __GenComplexFileSection__(self, Rule):\r
+    def __GenComplexFileSection__(self, Rule, IsMakefile=False):\r
 \r
         OutputFileList = []\r
         for Sect in Rule.SectionList:\r
-            if Sect.SectionType == 'PE32':\r
-                if Sect.FileName != None:\r
+            if Sect.SectionType == BINARY_FILE_TYPE_PE32:\r
+                if Sect.FileName is not None:\r
                     GenSecInputFile = self.__ExtendMacro__(Sect.FileName)\r
                     OutputFileList.append(GenSecInputFile)\r
                 else:\r
                     FileList, IsSect = Section.Section.GetFileList(self, '', Sect.FileExtension)\r
-                    OutputFileList.extend(FileList)    \r
-        \r
+                    OutputFileList.extend(FileList)\r
+\r
         return OutputFileList\r
 \r
-    
\ No newline at end of file
+class OverrideAttribs:\r
+\r
+    ## The constructor\r
+    #\r
+    #   @param  self        The object pointer\r
+    #\r
+    def __init__(self):\r
+\r
+        self.PciVendorId = None\r
+        self.PciClassCode = None\r
+        self.PciDeviceId = None\r
+        self.PciRevision = None\r
+        self.NeedCompress = None\r