From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web08.3410.1637128796865434088 for ; Tue, 16 Nov 2021 21:59:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: yuanhao.xie@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10170"; a="220773112" X-IronPort-AV: E=Sophos;i="5.87,240,1631602800"; d="scan'208";a="220773112" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2021 21:59:56 -0800 X-IronPort-AV: E=Sophos;i="5.87,240,1631602800"; d="scan'208";a="506774423" Received: from xieyuanh-mobl.ccr.corp.intel.com ([10.238.2.208]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2021 21:59:54 -0800 From: yuanhao.xie@intel.com To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You Subject: [PATCH] UefiPayloadPkg: Add the capability to override pcd when build the payload. Date: Wed, 17 Nov 2021 13:59:22 +0800 Message-Id: <20211117055922.1171-1-yuanhao.xie@intel.com> X-Mailer: git-send-email 2.32.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add the capability to override pcd when building the payload, one can use '--pcd a=b' to pass the argument. Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Signed-off-by: Yuanhao Xie --- UefiPayloadPkg/UniversalPayloadBuild.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py index e624ec5874..c7f31f5089 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -50,7 +50,7 @@ def RunCommand(cmd): print("- Failed - error happened when run command: %s"%cmd) raise Exception("ERROR: when run command: %s"%cmd) -def BuildUniversalPayload(Args, MacroList): +def BuildUniversalPayload(Args, MacroList, PcdList): BuildTarget = Args.Target ToolChain = Args.ToolChain ElfToolChain = 'CLANGDWARF' @@ -77,18 +77,23 @@ def BuildUniversalPayload(Args, MacroList): Defines = "" for key in MacroList: Defines +=" -D {0}={1}".format(key, MacroList[key]) + Pcd = "" + for key in PcdList: + Pcd +=" --pcd {0}={1}".format(key, PcdList[key]) # # Building DXE core and DXE drivers as DXEFV. # BuildPayload = f"build -p {DscPath} -b {BuildTarget} -a X64 -t {ToolChain} -y {PayloadReportPath}" BuildPayload += Defines + BuildPayload += Pcd RunCommand(BuildPayload) # # Building Universal Payload entry. # BuildModule = f"build -p {DscPath} -b {BuildTarget} -a X64 -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}" BuildModule += Defines + BuildModule += Pcd RunCommand(BuildModule) # @@ -118,6 +123,7 @@ def main(): parser.add_argument('-b', '--Target', default='DEBUG') parser.add_argument("-D", "--Macro", action="append", default=["UNIVERSAL_PAYLOAD=TRUE"]) parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI') + parser.add_argument("--pcd", action="append", default=[]) MacroList = {} args = parser.parse_args() if args.Macro is not None: @@ -127,7 +133,15 @@ def main(): raise Exception("ERROR: Unknown variable passed in: %s"%Argument) tokens = Argument.strip().split('=') MacroList[tokens[0].upper()] = tokens[1] - BuildUniversalPayload(args, MacroList) + PcdList = {} + if args.pcd is not None: + for Argument in args.pcd: + if Argument.count('=') != 1: + print("Unknown variable passed in: %s"%Argument) + raise Exception("ERROR: Unknown variable passed in: %s"%Argument) + tokens = Argument.strip().split('=') + PcdList[tokens[0]] = tokens[1] + BuildUniversalPayload(args, MacroList, PcdList) print ("Successfully build Universal Payload") if __name__ == '__main__': -- 2.26.2.windows.1