BaseTools: add the support for --pcd feature to patch the binary efi

the original --pcd feature can override the Pcd value when build the
source driver, while it missed the binary driver. this patch add the
support to patch the binary efi for --pcd feature.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index 8913a72111e210aff841b6231254f2ce80e7a516..475b794fe820a9c120b92287268855b542e04ccc 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -1427,6 +1427,11 @@ class TopLevelMakefile(BuildFile):
         if GlobalData.gIgnoreSource:\r
             ExtraOption += " --ignore-sources"\r
 \r
+        if GlobalData.BuildOptionPcd:\r
+            for index, option in enumerate(GlobalData.gCommand):\r
+                if "--pcd" == option and GlobalData.gCommand[index+1]:\r
+                    ExtraOption += " --pcd " + GlobalData.gCommand[index+1]\r
+\r
         MakefileName = self._FILE_NAME_[self._FileType]\r
         SubBuildCommandList = []\r
         for A in PlatformInfo.ArchList:\r

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index 3c59f14aa8cf7b9702503678cf3afb481c93d66e..bba42c730865b9ad95bea84659f6f4bfe69b30ba 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -1,7 +1,7 @@
 ## @file\r
 # process FFS generation from INF statement\r
 #\r
-#  Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #  Copyright (c) 2014-2016 Hewlett-Packard Development Company, L.P.<BR>\r
 #\r
 #  This program and the accompanying materials\r
@@ -43,6 +43,7 @@ from AutoGen.GenDepex import DependencyExpression
 from PatchPcdValue.PatchPcdValue import PatchBinaryFile\r
 from Common.LongFilePathSupport import CopyLongFilePath\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
+import Common.GlobalData as GlobalData\r
 \r
 ## generate FFS from INF\r
 #\r
@@ -260,7 +261,16 @@ class FfsInfStatement(FfsInfStatementClassObject):
                 DefaultValue = FdfPcdDict[PcdKey]\r
                 FdfOverride = True\r
 \r
-            if not DscOverride and not FdfOverride:\r
+            # Override Patchable PCD value by the value from Build Option\r
+            BuildOptionOverride = False\r
+            if GlobalData.BuildOptionPcd:\r
+                for pcd in GlobalData.BuildOptionPcd:\r
+                    if PcdKey == (pcd[1], pcd[0]):\r
+                        DefaultValue = pcd[2]\r
+                        BuildOptionOverride = True\r
+                        break\r
+\r
+            if not DscOverride and not FdfOverride and not BuildOptionOverride:\r
                 continue\r
             # Check value, if value are equal, no need to patch\r
             if Pcd.DatumType == "VOID*":\r

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index c2a2bd3760cb1762f8bd75a3fa8367c0f287fad9..672d1038702228931384bb03cf8eaf2105e8e3f2 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -38,13 +38,14 @@ from Common.Misc import DirCache, PathClass
 from Common.Misc import SaveFileOnChange\r
 from Common.Misc import ClearDuplicatedInf\r
 from Common.Misc import GuidStructureStringToGuidString\r
+from Common.Misc import CheckPcdDatum\r
 from Common.BuildVersion import gBUILD_VERSION\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 ## Version and Copyright\r
 versionNumber = "1.0" + ' ' + gBUILD_VERSION\r
 __version__ = "%prog Version " + versionNumber\r
-__copyright__ = "Copyright (c) 2007 - 2014, Intel Corporation  All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2016, Intel Corporation  All rights reserved."\r
 \r
 ## Tool entrance method\r
 #\r
@@ -266,6 +267,14 @@ def main():
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such a Capsule in FDF file: %s" % Options.uiCapName)\r
 \r
+        GenFdsGlobalVariable.WorkSpace = BuildWorkSpace\r
+        if ArchList != None:\r
+            GenFdsGlobalVariable.ArchList = ArchList\r
+\r
+        if Options.OptionPcd:\r
+            GlobalData.BuildOptionPcd = Options.OptionPcd\r
+            CheckBuildOptionPcd()\r
+\r
         """Modify images from build output if the feature of loading driver at fixed address is on."""\r
         if GenFdsGlobalVariable.FixedLoadAddress:\r
             GenFds.PreprocessImage(BuildWorkSpace, GenFdsGlobalVariable.ActivePlatform)\r
@@ -308,6 +317,79 @@ def SingleCheckCallback(option, opt_str, value, parser):
         gParamCheck.append(option)\r
     else:\r
         parser.error("Option %s only allows one instance in command line!" % option)\r
+\r
+def CheckBuildOptionPcd():\r
+    for Arch in GenFdsGlobalVariable.ArchList:\r
+        PkgList  = GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag)\r
+        for i, pcd in enumerate(GlobalData.BuildOptionPcd):\r
+            if type(pcd) is tuple:\r
+                continue\r
+            (pcdname, pcdvalue) = pcd.split('=')\r
+            if not pcdvalue:\r
+                EdkLogger.error('GenFds', OPTION_MISSING, "No Value specified for the PCD %s." % (pcdname))\r
+            if '.' in pcdname:\r
+                (TokenSpaceGuidCName, TokenCName) = pcdname.split('.')\r
+                HasTokenSpace = True\r
+            else:\r
+                TokenCName = pcdname\r
+                TokenSpaceGuidCName = ''\r
+                HasTokenSpace = False\r
+            TokenSpaceGuidCNameList = []\r
+            FoundFlag = False\r
+            PcdDatumType = ''\r
+            NewValue = ''\r
+            for package in PkgList:\r
+                for key in package.Pcds:\r
+                    PcdItem = package.Pcds[key]\r
+                    if HasTokenSpace:\r
+                        if (PcdItem.TokenCName, PcdItem.TokenSpaceGuidCName) == (TokenCName, TokenSpaceGuidCName):\r
+                            PcdDatumType = PcdItem.DatumType\r
+                            NewValue = BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)\r
+                            FoundFlag = True\r
+                    else:\r
+                        if PcdItem.TokenCName == TokenCName:\r
+                            if not PcdItem.TokenSpaceGuidCName in TokenSpaceGuidCNameList:\r
+                                if len (TokenSpaceGuidCNameList) < 1:\r
+                                    TokenSpaceGuidCNameList.append(PcdItem.TokenSpaceGuidCName)\r
+                                    PcdDatumType = PcdItem.DatumType\r
+                                    TokenSpaceGuidCName = PcdItem.TokenSpaceGuidCName\r
+                                    NewValue = BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)\r
+                                    FoundFlag = True\r
+                                else:\r
+                                    EdkLogger.error(\r
+                                            'GenFds',\r
+                                            PCD_VALIDATION_INFO_ERROR,\r
+                                            "The Pcd %s is found under multiple different TokenSpaceGuid: %s and %s." % (TokenCName, PcdItem.TokenSpaceGuidCName, TokenSpaceGuidCNameList[0])\r
+                                            )\r
+\r
+            GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, NewValue)\r
+\r
+def BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, Value):\r
+    if PcdDatumType == 'VOID*':\r
+        if Value.startswith('L'):\r
+            if not Value[1]:\r
+                EdkLogger.error('GenFds', OPTION_VALUE_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", B"{...}"')\r
+            Value = Value[0] + '"' + Value[1:] + '"'\r
+        elif Value.startswith('B'):\r
+            if not Value[1]:\r
+                EdkLogger.error('GenFds', OPTION_VALUE_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", B"{...}"')\r
+            Value = Value[1:]\r
+        else:\r
+            if not Value[0]:\r
+                EdkLogger.error('GenFds', OPTION_VALUE_INVALID, 'For Void* type PCD, when specify the Value in the command line, please use the following format: "string", L"string", B"{...}"')\r
+            Value = '"' + Value + '"'\r
+\r
+    IsValid, Cause = CheckPcdDatum(PcdDatumType, Value)\r
+    if not IsValid:\r
+        EdkLogger.error('build', FORMAT_INVALID, Cause, ExtraData="%s.%s" % (TokenSpaceGuidCName, TokenCName))\r
+    if PcdDatumType == 'BOOLEAN':\r
+        Value = Value.upper()\r
+        if Value == 'TRUE' or Value == '1':\r
+            Value = '1'\r
+        elif Value == 'FALSE' or Value == '0':\r
+            Value = '0'\r
+    return  Value\r
+\r
         \r
 ## Parse command line options\r
 #\r
@@ -341,6 +423,7 @@ def myOptionParser():
     Parser.add_option("-s", "--specifyaddress", dest="FixedAddress", action="store_true", type=None, help="Specify driver load address.")\r
     Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")\r
     Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")\r
+    Parser.add_option("--pcd", action="append", dest="OptionPcd", help="Set PCD value by command line. Format: \"PcdName=Value\" ")\r
 \r
     (Options, args) = Parser.parse_args()\r
     return Options\r

diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
index d1c9aff8d062512a8912b73f63a5bea48d1f033b..c3f36243f04175eae6eae3930b6c2e92dbf46d40 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
@@ -285,8 +285,6 @@ class GenFdsGlobalVariable:
         GenFdsGlobalVariable.FfsDir = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')\r
         if not os.path.exists(GenFdsGlobalVariable.FfsDir) :\r
             os.makedirs(GenFdsGlobalVariable.FfsDir)\r
-        if ArchList != None:\r
-            GenFdsGlobalVariable.ArchList = ArchList\r
 \r
         T_CHAR_LF = '\n'\r
         #\r