public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line
@ 2018-10-08  8:10 Chasel, Chiu
  2018-10-09  3:41 ` Zhu, Yonghong
  2018-10-10  6:15 ` Yao, Jiewen
  0 siblings, 2 replies; 3+ messages in thread
From: Chasel, Chiu @ 2018-10-08  8:10 UTC (permalink / raw)
  To: edk2-devel; +Cc: Jiewen Yao, Gao Liming, Zhu Yonghong, Chasel Chiu

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1231

Build system already support override PCD value by command
line so add this support to GenCfgOpt.py
Also update revision to 0.53

Test: Verified UPD header files generated can reflect different
      PCD values from --pcd build command input

Cc: Jiewen Yao <Jiewen.yao@intel.com>
Cc: Gao Liming <liming.gao@intel.com>
Cc: Zhu Yonghong <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 IntelFsp2Pkg/Tools/GenCfgOpt.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line
  2018-10-08  8:10 [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line Chasel, Chiu
@ 2018-10-09  3:41 ` Zhu, Yonghong
  2018-10-10  6:15 ` Yao, Jiewen
  1 sibling, 0 replies; 3+ messages in thread
From: Zhu, Yonghong @ 2018-10-09  3:41 UTC (permalink / raw)
  To: Chiu, Chasel, edk2-devel@lists.01.org
  Cc: Yao, Jiewen, Gao, Liming, Zhu, Yonghong

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong

-----Original Message-----
From: Chiu, Chasel 
Sent: Monday, October 08, 2018 4:11 PM
To: edk2-devel@lists.01.org
Cc: Yao, Jiewen <jiewen.yao@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
Subject: [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1231

Build system already support override PCD value by command line so add this support to GenCfgOpt.py Also update revision to 0.53

Test: Verified UPD header files generated can reflect different
      PCD values from --pcd build command input

Cc: Jiewen Yao <Jiewen.yao@intel.com>
Cc: Gao Liming <liming.gao@intel.com>
Cc: Zhu Yonghong <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
---
 IntelFsp2Pkg/Tools/GenCfgOpt.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line
  2018-10-08  8:10 [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line Chasel, Chiu
  2018-10-09  3:41 ` Zhu, Yonghong
@ 2018-10-10  6:15 ` Yao, Jiewen
  1 sibling, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2018-10-10  6:15 UTC (permalink / raw)
  To: Chiu, Chasel, edk2-devel@lists.01.org; +Cc: Gao, Liming, Zhu, Yonghong

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Chiu, Chasel
> Sent: Monday, October 8, 2018 4:11 PM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Gao, Liming
> <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>; Chiu,
> Chasel <chasel.chiu@intel.com>
> Subject: [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from
> command line
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1231
> 
> Build system already support override PCD value by command
> line so add this support to GenCfgOpt.py
> Also update revision to 0.53
> 
> Test: Verified UPD header files generated can reflect different
>       PCD values from --pcd build command input
> 
> Cc: Jiewen Yao <Jiewen.yao@intel.com>
> Cc: Gao Liming <liming.gao@intel.com>
> Cc: Zhu Yonghong <yonghong.zhu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> ---
>  IntelFsp2Pkg/Tools/GenCfgOpt.py | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> index 059cfcb7e4..15d33582ef 100644
> --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> @@ -88,6 +88,8 @@ are permitted provided that the following conditions
> are met:
>  **/
>  """
> 
> +BuildOptionPcd = []
> +
>  class CLogicalExpression:
>      def __init__(self):
>          self.index    = 0
> @@ -561,6 +563,12 @@ EndList
>                      self._PcdsDict[Match.group(1)] = Match.group(2)
>                      if self.Debug:
>                          print "INFO : PCD %s = [ %s ]" %
> (Match.group(1), Match.group(2))
> +                    i = 0
> +                    while i < len(BuildOptionPcd):
> +                        Match = re.match("\s*([\w\.]+)\s*\=\s*(\w+)",
> BuildOptionPcd[i])
> +                        if Match:
> +                            self._PcdsDict[Match.group(1)] =
> Match.group(2)
> +                        i += 1
>              else:
>                  Match = re.match("^\s*#\s+(!BSF|@Bsf|!HDR)\s+(.+)",
> DscLine)
>                  if Match:
> @@ -1462,7 +1470,7 @@ EndList
> 
> 
>  def Usage():
> -    print "GenCfgOpt Version 0.52"
> +    print "GenCfgOpt Version 0.53"
>      print "Usage:"
>      print "    GenCfgOpt  UPDTXT  PlatformDscFile BuildFvDir
> [-D Macros]"
>      print "    GenCfgOpt  HEADER  PlatformDscFile BuildFvDir
> InputHFile     [-D Macros]"
> @@ -1472,7 +1480,14 @@ def Main():
>      #
>      # Parse the options and args
>      #
> +    i = 1
> +
>      GenCfgOpt = CGenCfgOpt()
> +    while i < len(sys.argv):
> +        if sys.argv[i].strip().lower() == "--pcd":
> +            BuildOptionPcd.append(sys.argv[i+1])
> +            i += 1
> +        i += 1
>      argc = len(sys.argv)
>      if argc < 4:
>          Usage()
> --
> 2.13.3.windows.1



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-10-10  6:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-08  8:10 [PATCH V2] IntelFsp2Pkg/GenCfgOpt.py: Support PCD input from command line Chasel, Chiu
2018-10-09  3:41 ` Zhu, Yonghong
2018-10-10  6:15 ` Yao, Jiewen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox