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 A2EC3941684 for ; Fri, 25 Aug 2023 09:59:32 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=3ns09wFuQ/jR4DtaSBM2IR39rrICbLGDFAvcfEi/z4M=; 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=1692957571; v=1; b=D6bBYyhHxGHhZRMPi5sKtmZOrg4gXEosxCakUCIEaGDgbYcXpRiXIopk4ymh/m3iULM+Hyvj DBHHTX2xNeoJfsxZ1rbLq5Jv07tBuG34z0pzdcRfaGAj+Fu3cL7pK7NJLwT8gOpHOLvnnVU9WI/ +Og2Hkx/R8HbGZoA9yBkt79I= X-Received: by 127.0.0.2 with SMTP id sKlsYY7687511xWE1yCLXQCy; Fri, 25 Aug 2023 02:59:31 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.10103.1692957570359207729 for ; Fri, 25 Aug 2023 02:59:30 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="372077345" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="372077345" X-Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2023 02:59:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="687254130" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="687254130" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga003.jf.intel.com with ESMTP; 25 Aug 2023 02:59:28 -0700 X-Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) 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:59:28 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX612.amr.corp.intel.com (10.22.229.25) 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:59:27 -0700 X-Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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:59:27 -0700 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (134.134.137.103) 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:59:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E8rhidFk7cptbbcxbRabzwfZrCSXHih5LdzKmGsKFcmLUDnGUv0+YTeOgIEL2CpfvChxgqFlA886SY96v4pciQ4Y+p6ew+/z7Lwai6zMbqtHOCJX9mBEPgTfw3EGFdecVHT+/lHqUluGw4K5HF3+tXg7eh8SRxTUg3h9kiHDZI1SWE5/i1IRO1ZCBqwGXUDcmqnET3UfF6mRmisyY2/dNoDhoGXDv40D/CU4XkuecbSmwEOyq4uEOsmLxIQHDIvBD3bJ43/tSkkA0lPzxnZh09zwAV+Gqgm6EQNz5sDpfXzKzLDoGKbuToT8of3exY5LMEEw/JobtriXYFbPzjrnmg== 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=4jL5fHHhQVgSSghmW3/Wm88fmVmHcAnR6DYmpATVpBo=; b=Fl2BGKFXVgPh+fVIcNeAQPbxjJDAdNsUDpnR6gKdqUMhnG2cYK0fYBazcFdppJskBPRYAbMHt1Vc3fWqVRXf9Cnl8M3aqg1G3wNJ5hmnzJuRRKC1FxRsv4hmqMcJpz7s1FtsDGPft6NvbZ7W+2OpTdhm8gW8EN9MjAC/QoEAl/HC+Z3gE5Ao+5Qa7xcBWmU9djTac6bHlNAeertOanB1KiEcz0iCe5uKHtSXDxIX210AxbhapvusNMrLZqdMlqhkSeegwowerNM8FaaVl5qA//YCN2nRB7XnHIoA+uzUEcDzEmHJQPvAoUzIvo5U62/bCLjdkNZh9pe7FRTRl+3EGA== 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 CH3PR11MB7819.namprd11.prod.outlook.com (2603:10b6:610:125::20) by IA1PR11MB7775.namprd11.prod.outlook.com (2603:10b6:208:3f3::9) 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:59:24 +0000 X-Received: from CH3PR11MB7819.namprd11.prod.outlook.com ([fe80::6dba:854f:a134:2243]) by CH3PR11MB7819.namprd11.prod.outlook.com ([fe80::6dba:854f:a134:2243%4]) with mapi id 15.20.6699.028; Fri, 25 Aug 2023 09:59:23 +0000 From: "Lu, James" To: "Liu, KasimX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Guo, Gua" 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: AQHZ1zZtHAD8pBea7EioLNpUJUgt6a/6xx5Q Date: Fri, 25 Aug 2023 09:59:23 +0000 Message-ID: References: <20230825092746.1320-1-kasimx.liu@intel.com> In-Reply-To: <20230825092746.1320-1-kasimx.liu@intel.com> Accept-Language: en-001, en-US, zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH3PR11MB7819:EE_|IA1PR11MB7775:EE_ x-ms-office365-filtering-correlation-id: 69f3c580-c083-4610-e626-08dba551f5c9 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: p7Os+0pSpepWWQvZgSNHtRURdgPROz1GHfUpMXdBAi6Nu/MHshP23gwpKbePCug60Afp0S3VLNKnAwzrLTbymAC7KJF0we3WKLgvm1g3kywunX/hs6KgTbZNdo76fonWx50lJbyOqtDwN2Bt3McJbUwnG2oTloVUfg9G6CmQmxShPv18CunwBD8mL5KAxVWup8WOoWcHhXO/dx70FMZIXOhYINGDIlkE1PrdwKGDTwikUrApWNESas8OamQv7Z+h7OYT/7KB2UNYOXj3k4lGMBIdSaGifTleSW3hJMfaEdBPKl+S/EuDoG2kPfUJda2I/OcvZPmCRzjrYHR2LgjZRdPSJFDPuSCJ6nN/+ImaRs9r2ySue5uD9t3nurhtuT5w8ExxMVpXLBF6WbbVwk6wJIXmiUCRpBhlIOOv7BaFLpTUulbLDpp9um2l7rC9/a2n+P7vKRYHaR2bnOk24vN4gK7P/S8g7gg5EtxmwWa/WEXupLS4fO3Wybk8M4zwbZfGj0cJBedEyTog7Ibzl9EQkM7mnhgmvu5FhYCdSbuoKZ0548es00gLds1G++JiB4COaMBQHLZk7G+TkY2ZCXO2GZOhvskjPpOdU63R6GNC2iE= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?GbSd7r2Pdx1SIiGbpSJeJiVElU7ZtRgDiruiCkiZF4121FiUL79jYhfgPLNX?= =?us-ascii?Q?ijxsBqUWEVcReqFZze7G/orA7pefOfgb+zgF1ZRubko8N/blcE59Enpr3CGh?= =?us-ascii?Q?ZmuQq6diGM28kfgPEL4ZRycZm1nKYBYLPxdOCWBkJqlLQuhZTVMfLHV+iycB?= =?us-ascii?Q?l6Vj8d6RXTXwuRHPNSEyOaEZHRQKma1NjLfPdG9Qjdtfz7uKb5xtb/WupQSD?= =?us-ascii?Q?dX24pvUHIigGwp4uhYnrkseQq6zUYf6LYeBat1q4PZiWOJVLDBT/+1C3HcRU?= =?us-ascii?Q?htcuzIHFm/wb2ypk1Qxk0VNaEPzOxuGMTP2uBrctOo6lgkB1RBNaORXTRlw/?= =?us-ascii?Q?9Q2gZB5qvgkL6xbU53DtbvFiGWwFqsUMuwnT01/dH/NKP/BsOVUwc5sQaAip?= =?us-ascii?Q?/TjQhYfXiruk1S3Ex79QcLjq58mdwMzjHi7Vl8jcjTHQ4uhtIw6g209yiv6g?= =?us-ascii?Q?PSu73zChffYpqxC2r1wGxAEo94yI5mr7JQCoOBHG/VXOkr9aoA/PHjXVaiSC?= =?us-ascii?Q?KAMqY5mq5gQd0JaLX32s1qxu0muFpHoMXKCWfrmG2w49W0eDhPMt7P2TFIMn?= =?us-ascii?Q?RmuAmbCtBszEFCPbeKs99wAPsbo511PtN0LYqk9+U4ImD84EdkdifEEFSnqG?= =?us-ascii?Q?r1CZGv7fTuZrDDUhgE3vNRKTNI4zOo3HkbDiDTPpKl3zATpDjvO+HKxrt5ch?= =?us-ascii?Q?CjcpvLgYcuRLlxcqE5+FjMBvh9HN5nYl4ZgLDJOrLmub2rh7rKz/4oYVuzMd?= =?us-ascii?Q?KMd2N15gMx4XwSnML9p6lV96sngSh1K3WZ73it4NaPuZW3NudDBEIAmQlyTC?= =?us-ascii?Q?awRLXuCGtlYSwtTQlleRMbRMxL+KKtOxYOffz/EXo61pLZEaLid8jyPodkiX?= =?us-ascii?Q?1fTxhMJZ3pMq8HJMVRw4ISr2yBJ8cJkByvHRPKFR0Jf1uczIW0mdWzNOCkoU?= =?us-ascii?Q?mHQuD9/OPOVBtw5Q8SrUPPUMxjSjMwUd4qpKjbh3gLn+/gPhUgjYH6ZZOl4R?= =?us-ascii?Q?z2xCfGb36DOxgFp8fnYDlTexLaZhAqVN25WisU3DKtKzdWplmt1mD95uORwe?= =?us-ascii?Q?LbUL1r1STm1lkTNmHCKC0V9aixh1LshKNVZtLnQu5jDxVAglDpds1S0XYgMN?= =?us-ascii?Q?R7F0ZuL+HtRAfcW87iGjqGYLQ0hkFW4OclGRiCvl6IGWLBEb87F9SNYH+PUu?= =?us-ascii?Q?hvfQyc19Dg6raU3mzeyGqhWEwlQBBvfvOhAkO8PjXE/o2CyC1LEnEiCMRBhB?= =?us-ascii?Q?r0Z081LYLr86rHXkGndnWVzYu520oNzh+Okemy1NTSnzCMGbpA9PPXyhHS3H?= =?us-ascii?Q?ZQoyv14eM6IucexYjICEQ0Z4u9eOg2qUQmgLUMemsnqmYfwW7FKrzjbmt6Id?= =?us-ascii?Q?Ir33yt0tDrJdUpdEk0o0nGK8mYwZmFpwEKuvdaL/7MUIGTrMA0yiLobxLMcx?= =?us-ascii?Q?1TZw9L0zIlcchviZ0DScrLBcyJEeVEnDwWmu6aUvEGRPDzFKGV1UFmUbsk4m?= =?us-ascii?Q?6UNTmMJJuFOI8Nt+gzB4FgMUggV1ujxxiu6TbqY2cddP0mKtrpXnoGCVhw?= =?us-ascii?Q?=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB7819.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69f3c580-c083-4610-e626-08dba551f5c9 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Aug 2023 09:59:23.7097 (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: 54dhejz0fRZREM8SuHWQHs8KBWG24yXGb+rcKcOdhAvsAS9Ok+I8FwWP8Ad4DNpgu6ngQklMAaN9+Qe/tM45Bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7775 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,james.lu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: O6x1J0pqvL5P1U1xPr4aL3Qvx7686176AA= 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=D6bBYyhH; 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: James Lu Thanks, James -----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 (#108034): https://edk2.groups.io/g/devel/message/108034 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-