From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 36584AC0D4D for ; Fri, 25 Aug 2023 09:57:34 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=emUk9it6ZHfWQKtkWXeLQIQYqBVAHro+WgURv2jz+5s=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1692957452; v=1; b=swz75UsWDS2Mo3DY6p/+s90rVVHh52kB5BOfiMKJFbfdLwS4M9ghVBdTkWBf5D9dWMwBaaD7 ZpMCHQS4mqWPG/h1i2hCBO3TI5xAkUMsawatSoHvuOhLVYSQRUmqe2zVYum07gtXV1LQaKAgzqY mypFnBOEuCD4VCKXWIPxf2X0= X-Received: by 127.0.0.2 with SMTP id mCLYYY7687511x8wZPW772Gu; Fri, 25 Aug 2023 02:57:32 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.10075.1692957451486531819 for ; Fri, 25 Aug 2023 02:57:32 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="372076850" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="372076850" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2023 02:57:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="861021624" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="861021624" X-Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga004.jf.intel.com with ESMTP; 25 Aug 2023 02:57:23 -0700 X-Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 02:57:17 -0700 X-Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 25 Aug 2023 02:57:16 -0700 X-Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Fri, 25 Aug 2023 02:57:16 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Fri, 25 Aug 2023 02:57:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A//RlJIl/rdxM8F+CkZsahpkKs/OENNiNE6d+5vElgDpE9CG+HbdYUfDQbUMR4KFrLUBxIoHJWzVmb9DeHLPgX0oLdA7ilHDNoF+yom4tjAKUfQ1/sKU4OBCSDgxO0t8Ua2FqFyyCclHma0eFV6juyqshnZlS/Jj/CUs1MmG+OQsSU2ws2TikVlxqdYy+F8ApcVWjUi0ZYNAwUxNn/u6NLG9sdRJN31MsOQE0k1Z96yOdQK/Yd5p8nvTcIMvJ5yBh7Tjw60Yk3JK5UqGkr/H80CGpT4SaRS1VvFIPcGVCQcpeDIOJsrDwnU9zrlwe0gjTnipdgOlMmV+aJD5CLg1EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8bkm3ostmRHt7b3qaN416q+yu4gKhcXnMKmOzQq/2tA=; b=DiNguTceP2oVMugWa5/GJsad0F6qYiSk2ihov4UPkETXer09ZQBl9LqhaD22PbGx1mwDYB1ex89BsMuZlKz7gVXApzT/MWgnM9WkS/MjL6ZTqhe1ndYiSGi0T3z7idecG/woUE/1Kwf9YG6JIQAgnddbOJiMKW4jlYnGIzaHguQm+S9cnxliktatkjVcfl5qVFCkY8jsaD0e7/I1OL+GA8c7U2x80968sBUnECnQSTweMsVTtmASIQhw968RNjC4Yfz155goDgZ07qM2ESiq7M+MEEvqXcvvocUSTaGEv65WwiKQMefCXV5fThHgFCBrLn5rNxRXqb2i89hfuOheww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by SN7PR11MB6776.namprd11.prod.outlook.com (2603:10b6:806:263::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.27; Fri, 25 Aug 2023 09:57:14 +0000 X-Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::4cba:ef8e:852f:4136]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::4cba:ef8e:852f:4136%6]) with mapi id 15.20.6699.028; Fri, 25 Aug 2023 09:57:13 +0000 From: "Guo, Gua" To: "Liu, KasimX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Lu, James" Subject: Re: [edk2-devel] [PATCH v2] UefiPayloadPkg:Enhance the build processing for Universalpayload Thread-Topic: [PATCH v2] UefiPayloadPkg:Enhance the build processing for Universalpayload Thread-Index: AQHZ1zZtzry/Mk5RVE+X1HECopM2Ga/6xoaw Date: Fri, 25 Aug 2023 09:57:13 +0000 Message-ID: References: <20230825092746.1320-1-kasimx.liu@intel.com> In-Reply-To: <20230825092746.1320-1-kasimx.liu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR11MB5478:EE_|SN7PR11MB6776:EE_ x-ms-office365-filtering-correlation-id: 68e066e0-09d9-4a07-b997-08dba551a841 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: QFe0s+rfkZL7y2+u4pKdD3HANjQOTl3nvt4apQ/WZ2k8z7FCwO4/KcbA7Sq1uehC7LmD6F6AnGfyQBWW9kU5CipKXipSD4Clo8SqvwsXss9B46rjVB3Wcam6e9vW+LMxTqadS6/z1n7sA4jQ5Qw9KrEu9TOCTPWe2ZgeMx+7vOh7wefWmWTtVJMuV0zThUs/xs/0VSXIOGEUkhvWx1y5TGmqlXAM8OhXJ89BMKD06rSN7gKtc74qqwseHKW3Bj0H9UhkBV1tYRGmBkbT0yWUsncKXXP9AmNQxWFXggDHWIFmHNK7GUyCjjzqKxjuubWGvTlbrgzhZ9CryfyxLuUf3Q4F3JLDZ3IWne8MsowV3fkbqPHMLFBM/WnHyca4WljqztdZlbbCRFSOw5BtB7MPGBQPU4U0nDNKTJ23AoiPtl01N+rUZSK2fgUgZ+e7o0s5kck+0EDbO+Ya1ifk5dA+s10Jrjs4MhGKlszlqjsgTMmgjEDFrlQhOAlAL4CqbxqLmTDAsdJT6Dql9KVab9X7zsocQVEwPlZ7O2ERssh2gdbZjIKK0Sm4hYV56sLRjQoiOgxgJ8As74bamboSKg/rkseH025R4CCb0rfhfFT4ihQ= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?X6U2i/80MVtAvoHvG0amx342k9E/iKZroAeARk26wMVh1yJNglAKRoI06IRs?= =?us-ascii?Q?VgLZIzhOvvNVV5QqVSUWONVNa7J5Fa2B6i+sOAPu/nuHNQ0acHDLRUn7FBjV?= =?us-ascii?Q?64ryydn46CnzeXJeg9qWmYNYbe56k3ScTDTkhlHY0jSKksCIriwPyZG7vy6l?= =?us-ascii?Q?6z8hu1aUGGFH5q0xol85T7Xcz1qs+jogCZh1Gx/lEQgRM+Z352/AUYcxYPK7?= =?us-ascii?Q?HanYLX+WA9dEWQ6/nCq5VdD4k79u9y6A8xXLT6S715qPv7is4P2ABjHP6AJz?= =?us-ascii?Q?tKQr14KSdxJjOZ/HXmm0VqO/hPbWK750UWz1ZpjvZxrOyB1kZn2waVmRZJjk?= =?us-ascii?Q?tz7VQ6Es4U1WiuVD0AVrcZReK5WCSgKcJVC9UhNeRQDxarMsb3daa3RofEiA?= =?us-ascii?Q?os1922tNmM6qdaXnjhRPEZXsc8WrnLcVPGivRagwGQc1P3f5CeIABc7BRPpp?= =?us-ascii?Q?wU1xCHueWKRuUyzUdChbhaIV7OqpTKamMTh2Xxz04ntQ7+pu6ciR7lRtlX3W?= =?us-ascii?Q?nmt7RH1Q/a3g6KquAUxDfyy8SUpCLRL1K1dbSc19F84LtKBgoFpfmBh9XpFW?= =?us-ascii?Q?j5UPXtwZ7psvqy8DFzbSfMCi770ZC0eTmrZybFCVMKvLDhYkKtORyatzFBXy?= =?us-ascii?Q?q4+rRt+wcOz8xrEuUNI6h3/dP+8RShjcfe9CsuTprsR9lcZqkEsN6YlYymj8?= =?us-ascii?Q?q5flzryMvqZZF9Pcbnz/E0XPk7cbUaJ9Tc7XfcIqQQ0bM1p+A5R9PuA8MVET?= =?us-ascii?Q?chh3D4Tw5hMIDro8trG8UR7SQrWQouCO9Y1/e1g2VNNSnKxpSKHEfYr22Acq?= =?us-ascii?Q?KnWmpjmPhw8yHGHga+LLsGCaGCGAw4jdQgZ25xQCNRvG6oHABMWDIJZH8Oj0?= =?us-ascii?Q?MIrcKcWUQu1STG6X9l0XunyTEXdYQVu4WmJZ3p7VJMo5ihacJeOft7P8g9y9?= =?us-ascii?Q?SrnWrbzBM2eabV4lafjRjztfZ9/fWcBNzSPKdSddY/iuIZGOKChxd+EPksEy?= =?us-ascii?Q?2COl4rWcI57yJyDe4UzRvN782Ubi7vLw4QwgDfEVFh9agW6wayqwxdz9gjK1?= =?us-ascii?Q?GhER9YxPV3NSXrsSghh1gNcGxhrdNhYMLqxqsc7/deeu6ekihzgMhKFHvXYi?= =?us-ascii?Q?YzEVdZnWx1KRiFHWvC6RzGY2ktszgBMq/G2GH9QSTh6DsR7FtxJpH3FJy2Qs?= =?us-ascii?Q?svCVREWo74dqERPGGd+10uNrbyA3sOUcWqa6xNilay+x/rcm/rghcXtrGM7o?= =?us-ascii?Q?X6/iwDE0v0cLv3uKJ1sQBvAd8W6qyITSzEpPtAY64aHbZDpnsqCE1CXYWUwe?= =?us-ascii?Q?84RXkAlGgSAViI0W700/Hg8m6x4qSlUOZ06qXnrQwjO7KmBIcT7eJiH0lggI?= =?us-ascii?Q?tWrcttCkEYed0m/vv2ETynNn8JtSvkM60lpN3/qwB4N/i4ETD8ITPIoAYc9I?= =?us-ascii?Q?mb1ivOsaln3qxAUcm792TlQcOSS2RKxtDXlEHzvbJY2rmWCI4g7xryzZeNgq?= =?us-ascii?Q?0QHBYQp6Z1qlMNqxYS9+zR+MjkFgUA/n7k7fuaj94c4vBC+fiVppS64f9jca?= =?us-ascii?Q?LZgdwql8bUOgDXccd8lviq90sBVK/2zIwMd9s4mr?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68e066e0-09d9-4a07-b997-08dba551a841 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Aug 2023 09:57:13.6671 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: oqvP4k0JmzNyAEjBiegpF5famFuPgZb+oFhe4xRxUk1yHtxqLRmtfZT7Xk7ULf4Oxa6+BpGJ5ihnUN6NsHWupQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6776 X-OriginatorOrg: intel.com Precedence: Bulk 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,gua.guo@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: aOrDbfFaCsiRWzZVNS6yaB9ux7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=swz75UsW; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Gua Guo -----Original Message----- From: Liu, KasimX =20 Sent: Friday, August 25, 2023 5:28 PM To: devel@edk2.groups.io Cc: Liu, KasimX ; Dong, Guo ; Ni,= Ray ; Lu, James ; Guo, Gua Subject: [PATCH v2] UefiPayloadPkg:Enhance the build processing for Univers= alpayload From: KasimX Liu REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4532 To Copy the PrebuildUplBinary to Build folder then add/replace Fvs. Cc: Guo Dong Cc: Ray Ni Cc: James Lu Cc: Gua Guo Signed-off-by: KasimX Liu --- UefiPayloadPkg/UniversalPayloadBuild.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index ecc25dad83..47f37b3377 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -58,6 +58,7 @@ def BuildUniversalPayload(Args): BuildDir =3D os.path.join(os.environ['WORKSPACE'], os.path.normpat= h("Build/UefiPayloadPkgX64")) BuildModule =3D "" BuildArch =3D "" + if Args.Arch =3D=3D 'X64': BuildArch =3D "X64" EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) @@ -65,8 +66,6 @@ def BuildUniversalPayload(Args): BuildArch =3D "IA32 -a X64" EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/= UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) =20 - if Args.PreBuildUplBinary is not None: - EntryOutputDir =3D os.path.abspath(Args.PreBuildUplBinary) DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") @@ -99,6 +98,11 @@ def BuildUniversalPayload(Args): BuildModule +=3D Pcds BuildModule +=3D Defines RunCommand(BuildModule) + + if Args.PreBuildUplBinary is not None: + EntryOutputDir =3D os.path.join(BuildDir, "UniversalPayload.elf") + shutil.copy (os.path.abspath(Args.PreBuildUplBinary), EntryOutputD= ir) + # # Buid Universal Payload Information Section ".upld_info" # @@ -122,7 +126,8 @@ def BuildUniversalPayload(Args): AddSectionName =3D '.upld_info' ReplaceFv (EntryOutputDir, UpldInfoFile, AddSectionName, Alignment= =3D 4) =20 - shutil.copy (EntryOutputDir, os.path.join(BuildDir, 'UniversalPayload.= elf')) + if Args.PreBuildUplBinary is None: + shutil.copy (EntryOutputDir, os.path.join(BuildDir, 'UniversalPayl= oad.elf')) =20 return MultiFvList, os.path.join(BuildDir, 'UniversalPayload.elf') =20 --=20 2.39.1.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 (#108033): https://edk2.groups.io/g/devel/message/108033 Mute This Topic: https://groups.io/mt/100952717/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-