BaseTools: Move OverrideAttribs to OptRomInfStatement.py

Move "class OverrideAttribs" to OptRomInfStatement.py to remove
"import OptionRom" which may form a circular import:
GenFds.OptionRom => GenFds.OptRomInfStatement => GenFds.OptionRom

Contributed-under: TianoCore Contribution Agreement 1.1
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 5ff2e206dbc9f995bd49ab07b1b9272b73f9f5ca..4be790a819040ed8906b48dcecbfebf88dcf7691 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -4493,7 +4493,7 @@ class FdfParser:
     #\r
     def __GetOptRomOverrides(self, Obj):\r
         if self.__IsToken('{'):\r
     #\r
     def __GetOptRomOverrides(self, Obj):\r
         if self.__IsToken('{'):\r

-            Overrides = OptionRom.OverrideAttribs()\r
+            Overrides = OptRomInfStatement.OverrideAttribs()\r

             while True:\r
                 if self.__IsKeyword( "PCI_VENDOR_ID"):\r
                     if not self.__IsToken( "="):\r
             while True:\r
                 if self.__IsKeyword( "PCI_VENDOR_ID"):\r
                     if not self.__IsToken( "="):\r

diff --git a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
index dfeba5d0b140a4c12c7f767c5b5c8bbcf3e82fb1..e416b838d1e45b354bbdd0a60f354d0ed96a7dd4 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/OptRomInfStatement.py
@@ -45,9 +45,8 @@ class OptRomInfStatement (FfsInfStatement):
     #   @param  self        The object pointer\r
     #\r
     def __GetOptRomParams(self):\r
     #   @param  self        The object pointer\r
     #\r
     def __GetOptRomParams(self):\r

-        from . import OptionRom\r

         if self.OverrideAttribs is None:\r
         if self.OverrideAttribs is None:\r

-            self.OverrideAttribs = OptionRom.OverrideAttribs()\r
+            self.OverrideAttribs = OverrideAttribs()\r

 \r
         if self.OverrideAttribs.NeedCompress is None:\r
             self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('PCI_COMPRESS')\r
 \r
         if self.OverrideAttribs.NeedCompress is None:\r
             self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('PCI_COMPRESS')\r


@@ -150,3 +149,17 @@ class OptRomInfStatement (FfsInfStatement):
                     OutputFileList.extend(FileList)\r
 \r
         return OutputFileList\r
                     OutputFileList.extend(FileList)\r
 \r
         return OutputFileList\r

+\r
+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