## @file\r
# process OptionROM generation from INF statement\r
#\r
-# Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2017, 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
#\r
def __GetOptRomParams(self):\r
\r
- if self.OverrideAttribs == None:\r
+ if self.OverrideAttribs is None:\r
self.OverrideAttribs = OptionRom.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
+ if self.OverrideAttribs.PciClassCode is None:\r
self.OverrideAttribs.PciClassCode = self.OptRomDefs.get ('PCI_CLASS_CODE')\r
\r
- if self.OverrideAttribs.PciDeviceId == None:\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
+ 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
# @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
#\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
# @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
# @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