From nobody Sun May 19 12:45:51 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+103304+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+103304+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1681994899; cv=none; d=zohomail.com; s=zohoarc; b=BRuHNUat6gniFArnzrtflCwiDV5GG4H0uLtfTmg8BPV7BFH4KatUdle/fGNFGl+8j1MrCo45VBJuQHWGKcjZp/kO+RxMaibJUr3IwDmUIqmDKg9XkwDudmHlJfuNUIh2BP5Rxvg8rs3ILQVHXR34ASXUs+Bz+9/9CtnlGRIzVz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681994899; 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=5o/A3fuVxNP+rsT0eOgvxOWSbETb4rzSl8qElzYviY8=; b=guQAaokJq4EZIU3v+N6zEDUmsmiuQkJ2x1MFrA5f6tRzcuObEMIeZwdJgrXzGnG+vXPowHEh9FcTH4XKfUzq4GjF2GbCNpsawk7t5XTshO7no14oA2jdFhdxIeRb16v3nZujVioXhodsEkZbRA9QISbqiQE4j5WG366jb07HarY= 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+103304+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 1681994899297485.69086667040085; Thu, 20 Apr 2023 05:48:19 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tl8pYY1788612xyLYulvVw12; Thu, 20 Apr 2023 05:48:19 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.2626.1681976142089036179 for ; Thu, 20 Apr 2023 00:35:42 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="343139710" X-IronPort-AV: E=Sophos;i="5.99,211,1677571200"; d="scan'208";a="343139710" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2023 00:31:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10685"; a="685247942" X-IronPort-AV: E=Sophos;i="5.99,211,1677571200"; d="scan'208";a="685247942" X-Received: from coreboot.itwn.intel.com (HELO linuswux-mobl.gar.corp.intel.com) ([10.5.215.15]) by orsmga007.jf.intel.com with ESMTP; 20 Apr 2023 00:31:34 -0700 From: linusx.wu@intel.com To: devel@edk2.groups.io Cc: Linus Wu , Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Move Network modules from Dxe FV to Network FV in elf Date: Thu, 20 Apr 2023 15:31:29 +0800 Message-Id: <5c06696f3b044899e2e80b45742e76448b604cba.1681973922.git.linusx.wu@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,linusx.wu@intel.com X-Gm-Message-State: rKdSTPrnpVNrmlKo1VEhkgj9x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1681994899; bh=BVcrAmSUI62BvzFJKwcKk6NKHZaQ5AXAdxvqjroYYe0=; h=Cc:Date:From:Reply-To:Subject:To; b=CKJQpW+qA1F8qJaYJOgg4qvdaPIMhOs9yaT3NkEYNPwJCZwIVZgW5WqtlH+aWRdx3wo vNc+R4ZXoORpxdtf8FngoWON11NN4GJQSezVvxqUf9DQMV2NB9SqtKMfPS15O91BXRfpD q6qlq704hnFVV1u8bzJle+1txXeYmT1Ppyw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1681994899871100013 Content-Type: text/plain; charset="utf-8" From: Linus Wu REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4417 Since UefiPayload had supported multiple FV, move Network.fdf.inc to new firmware volume and add this network FV into elf file. Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: Linus Wu Reviewed-by: James Lu Reviewed-by: gua.guo@intel.com --- UefiPayloadPkg/UefiPayloadPkg.fdf | 32 +++++++++++++++++++++++-- UefiPayloadPkg/UniversalPayloadBuild.py | 12 ++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index ee7d718b3f..f8c2aa8c4a 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -60,6 +60,35 @@ FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE =3D DXEFV } =20 +!if $(NETWORK_DRIVER_ENABLE) =3D=3D TRUE +##########################################################################= ###### +[FV.NETWORKFV] +FvNameGuid =3D 3CF5CB69-C439-4B84-AF11-8167B22D7221 +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 + +# +# UEFI network modules +# +!include NetworkPkg/Network.fdf.inc +!endif + ##########################################################################= ###### [FV.BDSFV] FvNameGuid =3D CA5590AF-9558-4822-B5EA-BE2E876CD3EC @@ -276,14 +305,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResource= TableDxe/BootGraphicsResour =20 !if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf -!endif - # # UEFI network modules # !if $(NETWORK_DRIVER_ENABLE) =3D=3D TRUE !include NetworkPkg/Network.fdf.inc !endif +!endif =20 # # Shell diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index db7ce0500b..83e0de95d8 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -108,6 +108,7 @@ def BuildUniversalPayload(Args, MacroList): DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") 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")) + NetworkFvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ToolChain), os.path.normpath("FV/NETWORKFV.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") @@ -185,6 +186,17 @@ def BuildUniversalPayload(Args, MacroList): ObjCopyFlag, EntryOutputDir ) + # + # Append network fv to sections if exists + # + if os.path.isfile(NetworkFvOutputDir): + index =3D remove_section.find(EntryOutputDir) + remove_section =3D remove_section[:index] + '--remove-section = .upld.network_fv ' + remove_section[index:] + index =3D add_section.find(EntryOutputDir) + add_section =3D add_section[:index] + '--add-section .upld.net= work_fv=3D' + NetworkFvOutputDir + ' ' + add_section[index:] + index =3D set_section.find(EntryOutputDir) + set_section =3D set_section[:index] + '--set-section-alignment= .upld.network_fv=3D16 ' + set_section[index:] + RunCommand(remove_section) RunCommand(add_section) RunCommand(set_section) --=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 (#103304): https://edk2.groups.io/g/devel/message/103304 Mute This Topic: https://groups.io/mt/98384854/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-