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 073C9941907 for ; Fri, 25 Aug 2023 14:58:21 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=oqN7qclaNZd1C8cdgZQs5ibRnHM5iROadILfYeL2a1A=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1692975500; v=1; b=fzyL4c6Cmm/RucLMJAzt46/Z12L2ftjZU4k7VsWGYa3wOYInU/lsYMczc9h/pNOUFzh+vagA m0oMi6YH91wsM9JTBPxuCx43KgwIZx6lAOa4x4D7bYZaQAUwdkbyx9WgDQTSsRubgW+sCS6MeEm 9bVJaVLR2iSgw5K6bws+HGdg= X-Received: by 127.0.0.2 with SMTP id XqTsYY7687511xqIP4KcyWad; Fri, 25 Aug 2023 07:58:20 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.9740.1692955673164048142 for ; Fri, 25 Aug 2023 02:27:53 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="364869844" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="364869844" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2023 02:27:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="802904521" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="802904521" X-Received: from jenkailx-desk1.gar.corp.intel.com ([10.227.107.51]) by fmsmga008.fm.intel.com with ESMTP; 25 Aug 2023 02:27:50 -0700 From: kasimx.liu@intel.com To: devel@edk2.groups.io Cc: KasimX Liu , Guo Dong , Ray Ni , James Lu , Gua Guo Subject: [edk2-devel] [PATCH v2] UefiPayloadPkg:Enhance the build processing for Universalpayload Date: Fri, 25 Aug 2023 17:27:46 +0800 Message-Id: <20230825092746.1320-1-kasimx.liu@intel.com> MIME-Version: 1.0 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,kasimx.liu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: xfv2bF9SbHCDVDzNQafwQwzTx7686176AA= 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=fzyL4c6C; 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 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"))=0D BuildModule =3D ""=0D BuildArch =3D ""=0D +=0D if Args.Arch =3D=3D 'X64':=0D BuildArch =3D "X64"=0D EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D @@ -65,8 +66,6 @@ def BuildUniversalPayload(Args): BuildArch =3D "IA32 -a X64"=0D EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/= UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D =0D - if Args.PreBuildUplBinary is not None:=0D - EntryOutputDir =3D os.path.abspath(Args.PreBuildUplBinary)=0D DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc")=0D ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt")=0D UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin")=0D @@ -99,6 +98,11 @@ def BuildUniversalPayload(Args): BuildModule +=3D Pcds=0D BuildModule +=3D Defines=0D RunCommand(BuildModule)=0D +=0D + if Args.PreBuildUplBinary is not None:=0D + EntryOutputDir =3D os.path.join(BuildDir, "UniversalPayload.elf")= =0D + shutil.copy (os.path.abspath(Args.PreBuildUplBinary), EntryOutputD= ir)=0D +=0D #=0D # Buid Universal Payload Information Section ".upld_info"=0D #=0D @@ -122,7 +126,8 @@ def BuildUniversalPayload(Args): AddSectionName =3D '.upld_info'=0D ReplaceFv (EntryOutputDir, UpldInfoFile, AddSectionName, Alignment= =3D 4)=0D =0D - shutil.copy (EntryOutputDir, os.path.join(BuildDir, 'UniversalPayload.= elf'))=0D + if Args.PreBuildUplBinary is None:=0D + shutil.copy (EntryOutputDir, os.path.join(BuildDir, 'UniversalPayl= oad.elf'))=0D =0D return MultiFvList, os.path.join(BuildDir, 'UniversalPayload.elf')=0D =0D --=20 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108038): https://edk2.groups.io/g/devel/message/108038 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] -=-=-=-=-=-=-=-=-=-=-=-