BaseTools: Update Makefile to support FFS file generation

[mirror_edk2.git] / BaseTools / Source / Python / build / build.py

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 53f12457f8c3d24ac7b2818601fb335d15102d3b..f94285a964ed2ea4774cfe0a9a95cffeafdbdeb9 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -50,6 +50,7 @@ from PatchPcdValue.PatchPcdValue import *
 \r
 import Common.EdkLogger\r
 import Common.GlobalData as GlobalData\r
+from GenFds.GenFds import GenFds\r
 \r
 # Version and Copyright\r
 VersionNumber = "0.60" + ' ' + gBUILD_VERSION\r
@@ -774,6 +775,7 @@ class Build():
         GlobalData.gUseHashCache = BuildOptions.UseHashCache\r
         GlobalData.gBinCacheDest   = BuildOptions.BinCacheDest\r
         GlobalData.gBinCacheSource = BuildOptions.BinCacheSource\r
+        GlobalData.gEnableGenfdsMultiThread = BuildOptions.GenfdsMultiThread\r
 \r
         if GlobalData.gBinCacheDest and not GlobalData.gUseHashCache:\r
             EdkLogger.error("build", OPTION_NOT_SUPPORTED, ExtraData="--binary-destination must be used together with --hash.")\r
@@ -1208,7 +1210,7 @@ class Build():
     #   @param  CreateDepModuleMakeFile     Flag used to indicate creating makefile\r
     #                                       for dependent modules/Libraries\r
     #\r
-    def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False):\r
+    def _BuildPa(self, Target, AutoGenObject, CreateDepsCodeFile=True, CreateDepsMakeFile=True, BuildModule=False, FfsCommand={}):\r
         if AutoGenObject == None:\r
             return False\r
 \r
@@ -1224,7 +1226,7 @@ class Build():
 \r
             if not self.SkipAutoGen or Target == 'genmake':\r
                 self.Progress.Start("Generating makefile")\r
-                AutoGenObject.CreateMakeFile(CreateDepsMakeFile)\r
+                AutoGenObject.CreateMakeFile(CreateDepsMakeFile, FfsCommand)\r
                 self.Progress.Stop("done!")\r
             if Target == "genmake":\r
                 return True\r
@@ -1731,6 +1733,12 @@ class Build():
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
                 self.BuildReport.AddPlatformReport(Wa)\r
                 self.Progress.Stop("done!")\r
+\r
+                # Add ffs build to makefile\r
+                CmdListDict = {}\r
+                if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+                    CmdListDict = self._GenFfsCmd()\r
+\r
                 for Arch in Wa.ArchList:\r
                     GlobalData.gGlobalDefines['ARCH'] = Arch\r
                     Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget, ToolChain, Arch)\r
@@ -1740,7 +1748,7 @@ class Build():
                         if Ma == None:\r
                             continue\r
                         self.BuildModules.append(Ma)\r
-                    self._BuildPa(self.Target, Pa)\r
+                    self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict)\r
 \r
                 # Create MAP file when Load Fix Address is enabled.\r
                 if self.Target in ["", "all", "fds"]:\r
@@ -1819,6 +1827,10 @@ class Build():
                 self.Fdf = Wa.FdfFile\r
                 self.LoadFixAddress = Wa.Platform.LoadFixAddress\r
                 Wa.CreateMakeFile(False)\r
+                # Add ffs build to makefile\r
+                CmdListDict = None\r
+                if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+                    CmdListDict = self._GenFfsCmd()\r
                 self.Progress.Stop("done!")\r
                 MaList = []\r
                 ExitFlag = threading.Event()\r
@@ -1838,7 +1850,11 @@ class Build():
                                 if not self.SkipAutoGen or self.Target == 'genc':\r
                                     Ma.CreateCodeFile(True)\r
                                 if not self.SkipAutoGen or self.Target == 'genmake':\r
-                                    Ma.CreateMakeFile(True)\r
+                                    if CmdListDict and self.Fdf and (Module.File, Arch) in CmdListDict:\r
+                                        Ma.CreateMakeFile(True, CmdListDict[Module.File, Arch])\r
+                                        del CmdListDict[Module.File, Arch]\r
+                                    else:\r
+                                        Ma.CreateMakeFile(True)\r
                             MaList.append(Ma)\r
                             self.BuildModules.append(Ma)\r
                     self.AutoGenTime += int(round((time.time() - AutoGenStart)))\r
@@ -1922,6 +1938,17 @@ class Build():
                     #\r
                     self._SaveMapFile (MapBuffer, Wa)\r
 \r
+    def _GenFfsCmd(self):\r
+        CmdListDict = {}\r
+        GenFfsDict = GenFds.GenFfsMakefile('', GlobalData.gFdfParser, self, self.ArchList, GlobalData)\r
+        for Cmd in GenFfsDict:\r
+            tmpInf, tmpArch = GenFfsDict[Cmd]\r
+            if (tmpInf, tmpArch) not in CmdListDict.keys():\r
+                CmdListDict[tmpInf, tmpArch] = [Cmd]\r
+            else:\r
+                CmdListDict[tmpInf, tmpArch].append(Cmd)\r
+        return CmdListDict\r
+\r
     ## Build a platform in multi-thread mode\r
     #\r
     def _MultiThreadBuildPlatform(self):\r
@@ -1957,6 +1984,11 @@ class Build():
                 self.BuildReport.AddPlatformReport(Wa)\r
                 Wa.CreateMakeFile(False)\r
 \r
+                # Add ffs build to makefile\r
+                CmdListDict = None\r
+                if GlobalData.gEnableGenfdsMultiThread and self.Fdf:\r
+                    CmdListDict = self._GenFfsCmd()\r
+\r
                 # multi-thread exit flag\r
                 ExitFlag = threading.Event()\r
                 ExitFlag.clear()\r
@@ -1995,7 +2027,11 @@ class Build():
                                 continue\r
 \r
                             if not self.SkipAutoGen or self.Target == 'genmake':\r
-                                Ma.CreateMakeFile(True)\r
+                                if CmdListDict and self.Fdf and (Module.File, Arch) in CmdListDict:\r
+                                    Ma.CreateMakeFile(True, CmdListDict[Module.File, Arch])\r
+                                    del CmdListDict[Module.File, Arch]\r
+                                else:\r
+                                    Ma.CreateMakeFile(True)\r
                             if self.Target == "genmake":\r
                                 continue\r
                         self.BuildModules.append(Ma)\r
@@ -2311,7 +2347,7 @@ def MyOptionParser():
     Parser.add_option("--hash", action="store_true", dest="UseHashCache", default=False, help="Enable hash-based caching during build process.")\r
     Parser.add_option("--binary-destination", action="store", type="string", dest="BinCacheDest", help="Generate a cache of binary files in the specified directory.")\r
     Parser.add_option("--binary-source", action="store", type="string", dest="BinCacheSource", help="Consume a cache of binary files from the specified directory.")\r
-\r
+    Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=False, help="Enable GenFds multi thread to generate ffs file.")\r
     (Opt, Args) = Parser.parse_args()\r
     return (Opt, Args)\r
 \r