BaseTools: Enable --genfds-multi-thread to default build

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1302

This patch enable --genfds-multi-thread to default build.
This patch keep --genfds-multi-thread build option for
compatibility and also add a new build option to disable
genfds-multi-thread as --no-genfds-multi-thread.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 51943411ad..d8bc28e4d0 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -93,7 +93,7 @@ def resetFdsGlobalVariable():
     GenFdsGlobalVariable.SecCmdList = []

     GenFdsGlobalVariable.CopyList   = []

     GenFdsGlobalVariable.ModuleFile = ''

-    GenFdsGlobalVariable.EnableGenfdsMultiThread = False

+    GenFdsGlobalVariable.EnableGenfdsMultiThread = True

 

     GenFdsGlobalVariable.LargeFileInFvFlags = []

     GenFdsGlobalVariable.EFI_FIRMWARE_FILE_SYSTEM3_GUID = '5473C07A-3DCB-4dca-BD6F-1E9689E7349A'

@@ -140,6 +140,8 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
                 GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace)

             if FdsCommandDict.get("GenfdsMultiThread"):

                 GenFdsGlobalVariable.EnableGenfdsMultiThread = True

+            else:

+                GenFdsGlobalVariable.EnableGenfdsMultiThread = False

         os.chdir(GenFdsGlobalVariable.WorkSpaceDir)

 

         # set multiple workspace

@@ -402,7 +404,7 @@ def OptionsToCommandDict(Options):
     FdsCommandDict["quiet"] = Options.quiet

     FdsCommandDict["debug"] = Options.debug

     FdsCommandDict["Workspace"] = Options.Workspace

-    FdsCommandDict["GenfdsMultiThread"] = Options.GenfdsMultiThread

+    FdsCommandDict["GenfdsMultiThread"] = not Options.NoGenfdsMultiThread

     FdsCommandDict["fdf_file"] = [PathClass(Options.filename)] if Options.filename else []

     FdsCommandDict["build_target"] = Options.BuildTarget

     FdsCommandDict["toolchain_tag"] = Options.ToolChain

@@ -459,7 +461,8 @@ def myOptionParser():
     Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")

     Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")

     Parser.add_option("--pcd", action="append", dest="OptionPcd", help="Set PCD value by command line. Format: \"PcdName=Value\" ")

-    Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=False, help="Enable GenFds multi thread to generate ffs file.")

+    Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=True, help="Enable GenFds multi thread to generate ffs file.")

+    Parser.add_option("--no-genfds-multi-thread", action="store_true", dest="NoGenfdsMultiThread", default=False, help="Disable GenFds multi thread to generate ffs file.")

 

     Options, _ = Parser.parse_args()

     return Options

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index 0f691ae524..3dc73c8f61 100644
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -69,7 +69,7 @@ class GenFdsGlobalVariable:
     SecCmdList = []

     CopyList   = []

     ModuleFile = ''

-    EnableGenfdsMultiThread = False

+    EnableGenfdsMultiThread = True

 

     #

     # The list whose element are flags to indicate if large FFS or SECTION files exist in FV.