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>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Zhu Yonghong <yonghong.zhu@intel.com>
This commit is contained in:
Chasel, Chiu 2018-10-08 15:44:45 +08:00
parent 1a3bee2082
commit b9c055f72b
1 changed files with 16 additions and 1 deletions

View File

@ -88,6 +88,8 @@ are permitted provided that the following conditions are met:
**/ **/
""" """
BuildOptionPcd = []
class CLogicalExpression: class CLogicalExpression:
def __init__(self): def __init__(self):
self.index = 0 self.index = 0
@ -561,6 +563,12 @@ EndList
self._PcdsDict[Match.group(1)] = Match.group(2) self._PcdsDict[Match.group(1)] = Match.group(2)
if self.Debug: if self.Debug:
print "INFO : PCD %s = [ %s ]" % (Match.group(1), Match.group(2)) 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: else:
Match = re.match("^\s*#\s+(!BSF|@Bsf|!HDR)\s+(.+)", DscLine) Match = re.match("^\s*#\s+(!BSF|@Bsf|!HDR)\s+(.+)", DscLine)
if Match: if Match:
@ -1462,7 +1470,7 @@ EndList
def Usage(): def Usage():
print "GenCfgOpt Version 0.52" print "GenCfgOpt Version 0.53"
print "Usage:" print "Usage:"
print " GenCfgOpt UPDTXT PlatformDscFile BuildFvDir [-D Macros]" print " GenCfgOpt UPDTXT PlatformDscFile BuildFvDir [-D Macros]"
print " GenCfgOpt HEADER PlatformDscFile BuildFvDir InputHFile [-D Macros]" print " GenCfgOpt HEADER PlatformDscFile BuildFvDir InputHFile [-D Macros]"
@ -1472,7 +1480,14 @@ def Main():
# #
# Parse the options and args # Parse the options and args
# #
i = 1
GenCfgOpt = CGenCfgOpt() 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) argc = len(sys.argv)
if argc < 4: if argc < 4:
Usage() Usage()