sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Move OverrideAttribs to OptRomInfStatement.py

Browse Source 
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>
This commit is contained in:
Gary Lin
2018-07-13 18:18:34 +08:00
committed by Yonghong Zhu
parent bfa65b61dd
commit 8f3f5794b4
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseTools/Source/Python/GenFds/FdfParser.py
View File

@ -4493,7 +4493,7 @@ class FdfParser:
# #
def __GetOptRomOverrides(self, Obj): def __GetOptRomOverrides(self, Obj):
if self.__IsToken('{'): if self.__IsToken('{'):
Overrides = OptionRom.OverrideAttribs() Overrides = OptRomInfStatement.OverrideAttribs()
while True: while True:
if self.__IsKeyword( "PCI_VENDOR_ID"): if self.__IsKeyword( "PCI_VENDOR_ID"):
if not self.__IsToken( "="): if not self.__IsToken( "="):

17
BaseTools/Source/Python/GenFds/OptRomInfStatement.py
View File

@ -45,9 +45,8 @@ class OptRomInfStatement (FfsInfStatement):
# @param self The object pointer # @param self The object pointer
# #
def __GetOptRomParams(self): def __GetOptRomParams(self):
from . import OptionRom
if self.OverrideAttribs is None: if self.OverrideAttribs is None:
self.OverrideAttribs = OptionRom.OverrideAttribs() self.OverrideAttribs = OverrideAttribs()
if self.OverrideAttribs.NeedCompress is None: if self.OverrideAttribs.NeedCompress is None:
self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('PCI_COMPRESS') self.OverrideAttribs.NeedCompress = self.OptRomDefs.get ('PCI_COMPRESS')
@ -150,3 +149,17 @@ class OptRomInfStatement (FfsInfStatement):
OutputFileList.extend(FileList) OutputFileList.extend(FileList)
return OutputFileList return OutputFileList
class OverrideAttribs:
## The constructor
#
# @param self The object pointer
#
def __init__(self):
self.PciVendorId = None
self.PciClassCode = None
self.PciDeviceId = None
self.PciRevision = None
self.NeedCompress = None