BaseTools: Update Makefile to support FFS file generation

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

diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source/Python/GenFds/OptionRom.py
index 7886a7cfe73e6b639d30b5d50c13aec4acc61620..2e61a38c1d333693bbb3912c4c770c7cfd586e26 100644 (file)
--- a/BaseTools/Source/Python/GenFds/OptionRom.py
+++ b/BaseTools/Source/Python/GenFds/OptionRom.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process OptionROM generation\r
 #\r
-#  Copyright (c) 2007 - 2016, 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
@@ -49,9 +49,9 @@ class OPTIONROM (OptionRomClassObject):
     #   @param  Buffer      The buffer generated OptROM data will be put\r
     #   @retval string      Generated OptROM file path\r
     #\r
-    def AddToBuffer (self, Buffer) :\r
-\r
-        GenFdsGlobalVariable.InfLogger( "\nGenerating %s Option ROM ..." %self.DriverName)\r
+    def AddToBuffer (self, Buffer, Flag=False) :\r
+        if not Flag:\r
+            GenFdsGlobalVariable.InfLogger( "\nGenerating %s Option ROM ..." %self.DriverName)\r
 \r
         EfiFileList = []\r
         BinFileList = []\r
@@ -60,7 +60,7 @@ class OPTIONROM (OptionRomClassObject):
         for FfsFile in self.FfsList :\r
             \r
             if isinstance(FfsFile, OptRomInfStatement.OptRomInfStatement):\r
-                FilePathNameList = FfsFile.GenFfs()\r
+                FilePathNameList = FfsFile.GenFfs(IsMakefile=Flag)\r
                 if len(FilePathNameList) == 0:\r
                     EdkLogger.error("GenFds", GENFDS_ERROR, "Module %s not produce .efi files, so NO file could be put into option ROM." % (FfsFile.InfFileName))\r
                 if FfsFile.OverrideAttribs == None:\r
@@ -79,10 +79,11 @@ class OPTIONROM (OptionRomClassObject):
                                                            FfsFile.OverrideAttribs.PciClassCode, \r
                                                            FfsFile.OverrideAttribs.PciRevision, \r
                                                            FfsFile.OverrideAttribs.PciDeviceId, \r
-                                                           FfsFile.OverrideAttribs.PciVendorId)\r
+                                                           FfsFile.OverrideAttribs.PciVendorId,\r
+                                                           IsMakefile = Flag)\r
                     BinFileList.append(TmpOutputFile)\r
             else:\r
-                FilePathName = FfsFile.GenFfs()\r
+                FilePathName = FfsFile.GenFfs(IsMakefile=Flag)\r
                 if FfsFile.OverrideAttribs != None:\r
                     FileName = os.path.basename(FilePathName)\r
                     TmpOutputDir = os.path.join(GenFdsGlobalVariable.FvDir, self.DriverName, FfsFile.CurrentArch)\r
@@ -97,7 +98,8 @@ class OPTIONROM (OptionRomClassObject):
                                                            FfsFile.OverrideAttribs.PciClassCode, \r
                                                            FfsFile.OverrideAttribs.PciRevision, \r
                                                            FfsFile.OverrideAttribs.PciDeviceId, \r
-                                                           FfsFile.OverrideAttribs.PciVendorId)\r
+                                                           FfsFile.OverrideAttribs.PciVendorId,\r
+                                                           IsMakefile=Flag)\r
                     BinFileList.append(TmpOutputFile)\r
                 else:\r
                     if FfsFile.FileType == 'EFI':\r
@@ -114,10 +116,11 @@ class OPTIONROM (OptionRomClassObject):
         GenFdsGlobalVariable.GenerateOptionRom(\r
                                 OutputFile,\r
                                 EfiFileList,\r
-                                BinFileList\r
-                                )\r
+                                BinFileList,\r
+                                IsMakefile=Flag)\r
 \r
-        GenFdsGlobalVariable.InfLogger( "\nGenerate %s Option ROM Successfully" %self.DriverName)\r
+        if not Flag:\r
+            GenFdsGlobalVariable.InfLogger( "\nGenerate %s Option ROM Successfully" %self.DriverName)\r
         GenFdsGlobalVariable.SharpCounter = 0\r
         \r
         return OutputFile\r