From nobody Wed May 15 02:18:44 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+108038+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+108038+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1692975501; cv=none; d=zohomail.com; s=zohoarc; b=L/5gVu+nNeu51TifTO1CN9nTwuk8OH19xds7weLY8YhEAfQ6ohPw8FCs49Xqyei5QuaR6qX9SW1RKFKcF4SgZwiDMYrGbHtzi5GBaBQ3OAa8rES7cpAjAk3ML6chYmi95V/Hy/LK4sTuMMuPMPfBHj6uhypmpNtIyOkN/5bFS8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692975501; 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=80Ozq97epBfshqenYnrCvNEW8rGA/l7cnqnTGA5yn8o=; b=dHeeYdy+JDbHueIweqHy+XJib6+HpVCvcF0Zo6+SSTqwgDklDwqBlp0aImpB1Uaxce+Y1KMaUYd+d+jvN5Qbi+xAqrLr1o//rolGmYlF3A5XYsV5EFQMq+pMzJoq5+C4vyhtNnHy2BpxYuYj1ThP5E5rB92vruiofpP3lX1DuY4= 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+108038+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 1692975501134120.35879877535956; Fri, 25 Aug 2023 07:58:21 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=eo8ii16oAPCTVFjlRChKFzzgOzNVtOh9nzeQPJRrFB8=; 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=f/MJrtB7+D/jzhpLrbCPDGeH+eZwe7ZWtRyCbH+bkHg6jb91szeHt9N/HOuTtm6KwPJED+6G XD2gXx39WBgEM/U/pHwaTC+yxYmWBp5GPjq3JW3HeC78cqpg6QOSRim7ZjeyB8UtV0bcqfzt3yW NbYZhE678cN3X16FHUHt0FhI= X-Received: by 127.0.0.2 with SMTP id mvXkYY1788612xgIfrIKLYDl; 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: tDSXEv87fKeXw5Jgzybx6xsPx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1692975503555100003 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Gua Guo Reviewed-by: James Lu --- 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 (#108038): https://edk2.groups.io/g/devel/message/108038 Mute This Topic: https://groups.io/mt/100952717/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-