From nobody Fri May 3 04:43:41 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+97589+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+97589+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1671496843; cv=none; d=zohomail.com; s=zohoarc; b=PmKY+UPCY4m1QQofsBIDWRutSk3zmkxHFbnycSRFX8K0QHR7AoNmokIwfYjOcf879VOz4QKXKtmBdwRxrUMuhJLh/orylrrfNcBhGtzfX4CXHVt469TuyPnhiK5KJ+NeBPpTQmyMMLYgYR2NZ8FlJq1kNAk31pZ5tJgGQIXg+gs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671496843; 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=iUxc4EshjDZAens+xKRkgPcV9SVf/6Gn7j6o0nFUXS8=; b=Hd401T50w8k+qBr3l9uIe/gjE8+nDETBd5TEletBO+CKDTKmGTQ71h57IosJiFKF4c/PKx99goQA7EJxjQ8gYYXB7fsRo+8Am6aOkRHs1vD/RcPr8Tu1tcfdfdJOcwTz6qLK7onxzWj4ia+pIZPquNPznQZmJHbwhM4+XsUGR8M= 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+97589+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 1671496843676868.9769903429991; Mon, 19 Dec 2022 16:40:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9lrCYY1788612xxJyARDvC66; Mon, 19 Dec 2022 16:40:43 -0800 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.12996.1671420045946980869 for ; Sun, 18 Dec 2022 19:20:46 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="299593098" X-IronPort-AV: E=Sophos;i="5.96,254,1665471600"; d="scan'208";a="299593098" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2022 19:20:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="979251813" X-IronPort-AV: E=Sophos;i="5.96,254,1665471600"; d="scan'208";a="979251813" X-Received: from marslinx-desk1.gar.corp.intel.com ([10.5.215.146]) by fmsmga005.fm.intel.com with ESMTP; 18 Dec 2022 19:20:43 -0800 From: marsx.lin@intel.com To: devel@edk2.groups.io Cc: MarsX Lin , Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel] [PATCH v2] UefiPayloadPkg: Move bdsdxe.inf from DXEFV to BDSFV Date: Mon, 19 Dec 2022 11:20:33 +0800 Message-Id: <20221219032033.532-1-marsx.lin@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,marsx.lin@intel.com X-Gm-Message-State: xJuDpbc9VHYdBMKKIzL9v2ARx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671496843; bh=SqQ7ryrAw6WQghBJGM2HHpRA8z7c1i8wpMEgFf5e6Ss=; h=Cc:Date:From:Reply-To:Subject:To; b=B17frlQyhvNy/tOlprbZzC/RctyoQEoxw5XQyGHxSNq2vq6p3LXCnZEJ6y4pv8DmCYi xHF3IL8N3Ud7jcIf8yhi8Pbn7BTwSfZBo9kIGG8IqXCrdQ4d89EuVujRC1kIUqlxTFcpI 7i/ferCRqqGr69HR4nkWEJUetSjWG8ssw3s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671496845333100014 Content-Type: text/plain; charset="utf-8" From: MarsX Lin REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4196 Since UefiPayload had supported multiple fv, move bdsdxe.inf to new firmware volume and modify the script of UniversalPayloadPkgBuild.py to support bdsdxe fv in elf file Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: MarsX Lin Reviewed-by: Gua Guo =20 --- UefiPayloadPkg/UefiPayloadPkg.fdf | 27 +++++++++++++++++++- UefiPayloadPkg/UniversalPayloadBuild.py | 12 +++++---- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index 9c9e2f2741..94ba922244 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -59,8 +59,33 @@ INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE =3D DXEFV } +FILE FV_IMAGE =3D FBE6C1E3-2F80-4770-88B0-494186E3346F { + SECTION FV_IMAGE =3D BDSFV +} =20 ##########################################################################= ###### +[FV.BDSFV] +FvNameGuid =3D CA5590AF-9558-4822-B5EA-BE2E876CD3EC +BlockSize =3D $(FD_BLOCK_SIZE) +FvForceRebase =3D FALSE +FvAlignment =3D 16 +ERASE_POLARITY =3D 1 +MEMORY_MAPPED =3D TRUE +STICKY_WRITE =3D TRUE +LOCK_CAP =3D TRUE +LOCK_STATUS =3D TRUE +WRITE_DISABLED_CAP =3D TRUE +WRITE_ENABLED_CAP =3D TRUE +WRITE_STATUS =3D TRUE +WRITE_LOCK_CAP =3D TRUE +WRITE_LOCK_STATUS =3D TRUE +READ_DISABLED_CAP =3D TRUE +READ_ENABLED_CAP =3D TRUE +READ_STATUS =3D TRUE +READ_LOCK_CAP =3D TRUE +READ_LOCK_STATUS =3D TRUE + +INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf =20 [FV.DXEFV] FvNameGuid =3D 8063C21A-8E58-4576-95CE-089E87975D23 @@ -106,7 +131,7 @@ INF CryptoPkg/Driver/CryptoDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf !endif INF UefiCpuPkg/CpuDxe/CpuDxe.inf -INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf + INF RuleOverride =3D UI MdeModulePkg/Application/UiApp/UiApp.inf INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index 50a5950e7c..6d62b8b20f 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -67,7 +67,8 @@ def BuildUniversalPayload(Args, MacroList): =20 EntryModuleInf =3D os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry.inf") DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") - FvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget, To= olChain), os.path.normpath("FV/DXEFV.Fv")) + DxeFvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget,= ToolChain), os.path.normpath("FV/DXEFV.Fv")) + BdsFvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget,= ToolChain), os.path.normpath("FV/BDSFV.Fv")) PayloadReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload.txt= ") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") @@ -119,21 +120,22 @@ def BuildUniversalPayload(Args, MacroList): # # Copy the DXEFV as a section in elf format Universal Payload entry. # - remove_section =3D '"{}" -I {} -O {} --remove-section .upld_info --rem= ove-section .upld.uefi_fv {}'.format ( + remove_section =3D '"{}" -I {} -O {} --remove-section .upld_info --rem= ove-section .upld.uefi_fv --remove-section .upld.bds_fv {}'.format ( LlvmObjcopyPath, ObjCopyFlag, ObjCopyFlag, EntryOutputDir ) - add_section =3D '"{}" -I {} -O {} --add-section .upld_info=3D{} --a= dd-section .upld.uefi_fv=3D{} {}'.format ( + add_section =3D '"{}" -I {} -O {} --add-section .upld_info=3D{} --a= dd-section .upld.uefi_fv=3D{} --add-section .upld.bds_fv=3D{} {}'.format ( LlvmObjcopyPath, ObjCopyFlag, ObjCopyFlag, UpldInfoFile, - FvOutputDir, + DxeFvOutputDir, + BdsFvOutputDir, EntryOutputDir ) - set_section =3D '"{}" -I {} -O {} --set-section-alignment .upld_inf= o=3D4 --set-section-alignment .upld.uefi_fv=3D16 {}'.format ( + set_section =3D '"{}" -I {} -O {} --set-section-alignment .upld_inf= o=3D16 --set-section-alignment .upld.uefi_fv=3D16 --set-section-alignment .= upld.bds_fv=3D16 {}'.format ( LlvmObjcopyPath, ObjCopyFlag, ObjCopyFlag, --=20 2.33.0.windows.2 -=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 (#97589): https://edk2.groups.io/g/devel/message/97589 Mute This Topic: https://groups.io/mt/95760042/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-