From nobody Tue Apr 16 22:14:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83811+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83811+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1637163792; cv=none; d=zohomail.com; s=zohoarc; b=UKhDYqK88vo9Jy6+9eCXQJ7CLwJFMOwmasRYy/SoPKI4wN7uBy7RS3rij2Y0xbIwihUvEdkEE0fb/Ta9krPhqdLOZp4RIH17VAoXSenSP59uN4WOzXjJYyfnhb8NqzzjB3Pwr9bEIDmgLlLEzmSe+twgQ2Uq0fQJhwavMorF6TQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637163792; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=XcWFaBBEVAetuP3k252NAC1tQQ4QGAl6jNRa9CTdUSM=; b=BaLQaXVciFcN9JP6IZDMO7FVvTjcfb+yHC96KJ1rbnnIoZArI3T6dwqu8Hh+76SV6oY7myqZ12q0aRbms7ek6HU51FjFE/Rgf2/NgRxZR1ku4x8bAvFAzofiYCIIdgIu5MRTXuJlHeGGSRrObrhW14N78+6ndRdb+8IUCsYLEK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83811+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1637163792927344.8002772665334; Wed, 17 Nov 2021 07:43:12 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id AubZYY1788612xUPyJp6yUah; Wed, 17 Nov 2021 07:43:12 -0800 X-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 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" X-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" X-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" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You Subject: [edk2-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yuanhao.xie@intel.com X-Gm-Message-State: 9pQAH7a8pq55z92pQ5JZbuiHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1637163792; bh=/JS2UQ81J3ZwUz/r/9UxJ5Q4h1nN7MLhfPU3piLKO/U=; h=Cc:Date:From:Reply-To:Subject:To; b=IsOVHGfO/B6nnfHNGU/geFG/DnWQLB7HC/a94I/T3RTelA9TmljAS3M6SJHkBlfwurA 3azEyO13CMzUIvYl3AwwiVNyeKMVM3xOEagk+ec9lDah4PU/FfwA9Oag5f92KE+9zZL+2 KyLf5V9aD17JqIhur7kFrRmrj9yadBkSQJU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1637163793539100002 Content-Type: text/plain; charset="utf-8" Add the capability to override pcd when building the payload, one can use '--pcd a=3Db' 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/Unive= rsalPayloadBuild.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) =20 -def BuildUniversalPayload(Args, MacroList): +def BuildUniversalPayload(Args, MacroList, PcdList): BuildTarget =3D Args.Target ToolChain =3D Args.ToolChain ElfToolChain =3D 'CLANGDWARF' @@ -77,18 +77,23 @@ def BuildUniversalPayload(Args, MacroList): Defines =3D "" for key in MacroList: Defines +=3D" -D {0}=3D{1}".format(key, MacroList[key]) + Pcd =3D "" + for key in PcdList: + Pcd +=3D" --pcd {0}=3D{1}".format(key, PcdList[key]) =20 # # Building DXE core and DXE drivers as DXEFV. # BuildPayload =3D f"build -p {DscPath} -b {BuildTarget} -a X64 -t {Tool= Chain} -y {PayloadReportPath}" BuildPayload +=3D Defines + BuildPayload +=3D Pcd RunCommand(BuildPayload) # # Building Universal Payload entry. # BuildModule =3D f"build -p {DscPath} -b {BuildTarget} -a X64 -m {Entry= ModuleInf} -t {ElfToolChain} -y {ModuleReportPath}" BuildModule +=3D Defines + BuildModule +=3D Pcd RunCommand(BuildModule) =20 # @@ -118,6 +123,7 @@ def main(): parser.add_argument('-b', '--Target', default=3D'DEBUG') parser.add_argument("-D", "--Macro", action=3D"append", default=3D["UN= IVERSAL_PAYLOAD=3DTRUE"]) parser.add_argument('-i', '--ImageId', type=3Dstr, help=3D'Specify pay= load ID (16 bytes maximal).', default =3D'UEFI') + parser.add_argument("--pcd", action=3D"append", default=3D[]) MacroList =3D {} args =3D parser.parse_args() if args.Macro is not None: @@ -127,7 +133,15 @@ def main(): raise Exception("ERROR: Unknown variable passed in: %s"%Ar= gument) tokens =3D Argument.strip().split('=3D') MacroList[tokens[0].upper()] =3D tokens[1] - BuildUniversalPayload(args, MacroList) + PcdList =3D {} + if args.pcd is not None: + for Argument in args.pcd: + if Argument.count('=3D') !=3D 1: + print("Unknown variable passed in: %s"%Argument) + raise Exception("ERROR: Unknown variable passed in: %s"%Ar= gument) + tokens =3D Argument.strip().split('=3D') + PcdList[tokens[0]] =3D tokens[1] + BuildUniversalPayload(args, MacroList, PcdList) print ("Successfully build Universal Payload") =20 if __name__ =3D=3D '__main__': --=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83811): https://edk2.groups.io/g/devel/message/83811 Mute This Topic: https://groups.io/mt/87122162/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-