IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line

[mirror_edk2.git] / IntelFsp2Pkg / Tools / GenCfgOpt.py

diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index 059cfcb7e4179ba7b91b939f4f11f5539962b07e..15d33582ef3a4cc42cc5d3ea383db5c93396599d 100644 (file)
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -88,6 +88,8 @@ are permitted provided that the following conditions are met:
 **/\r
 """\r
 \r
+BuildOptionPcd = []\r
+\r
 class CLogicalExpression:\r
     def __init__(self):\r
         self.index    = 0\r
@@ -561,6 +563,12 @@ EndList
                     self._PcdsDict[Match.group(1)] = Match.group(2)\r
                     if self.Debug:\r
                         print "INFO : PCD %s = [ %s ]" % (Match.group(1), Match.group(2))\r
+                    i = 0\r
+                    while i < len(BuildOptionPcd):\r
+                        Match = re.match("\s*([\w\.]+)\s*\=\s*(\w+)", BuildOptionPcd[i])\r
+                        if Match:\r
+                            self._PcdsDict[Match.group(1)] = Match.group(2)\r
+                        i += 1\r
             else:\r
                 Match = re.match("^\s*#\s+(!BSF|@Bsf|!HDR)\s+(.+)", DscLine)\r
                 if Match:\r
@@ -1462,7 +1470,7 @@ EndList
 \r
 \r
 def Usage():\r
-    print "GenCfgOpt Version 0.52"\r
+    print "GenCfgOpt Version 0.53"\r
     print "Usage:"\r
     print "    GenCfgOpt  UPDTXT  PlatformDscFile BuildFvDir                 [-D Macros]"\r
     print "    GenCfgOpt  HEADER  PlatformDscFile BuildFvDir  InputHFile     [-D Macros]"\r
@@ -1472,7 +1480,14 @@ def Main():
     #\r
     # Parse the options and args\r
     #\r
+    i = 1\r
+\r
     GenCfgOpt = CGenCfgOpt()\r
+    while i < len(sys.argv):\r
+        if sys.argv[i].strip().lower() == "--pcd":\r
+            BuildOptionPcd.append(sys.argv[i+1])\r
+            i += 1\r
+        i += 1\r
     argc = len(sys.argv)\r
     if argc < 4:\r
         Usage()\r