From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 46FBB21184AAA for ; Wed, 31 Oct 2018 17:43:36 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2018 17:43:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,450,1534834800"; d="scan'208";a="277353844" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga006.fm.intel.com with ESMTP; 31 Oct 2018 17:43:35 -0700 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 31 Oct 2018 17:43:35 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 31 Oct 2018 17:43:34 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by shsmsx102.ccr.corp.intel.com ([169.254.2.84]) with mapi id 14.03.0415.000; Thu, 1 Nov 2018 08:43:32 +0800 From: "Fu, Siyuan" To: Leif Lindholm CC: "edk2-devel@lists.01.org" , Ard Biesheuvel , "Kinney, Michael D" Thread-Topic: [PATCH v1] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. Thread-Index: AQHUcTowu6QFYQcoU0OvJAQBzEiKI6U6FMJg Date: Thu, 1 Nov 2018 00:43:32 +0000 Message-ID: References: <20181031033851.67664-1-siyuan.fu@intel.com> <20181031165253.7nyty6udqlyuaehc@bivouac.eciton.net> In-Reply-To: <20181031165253.7nyty6udqlyuaehc@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNmJkNDZmZjMtY2IzZS00NTliLTk2ZWMtMTg4ZTMzMGRlM2Y5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiMWN0WmNjXC84UkVEV2k5VFJFY05hY1Z6QTJUcmlvcmFuREJ4dUVTejlaeUlsbENhUHVkTlBjb2RmbXhqMlwvRnFwIn0= dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v1] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Nov 2018 00:43:36 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Leif So you have tested all the platform build? That's great, thanks a lot. Do you want me to merge these 3 patches to a combo v2 patch, or can you hel= p to commit the patch set to edk2-platform repo? BestRegards Fu Siyuan > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > Sent: Thursday, November 1, 2018 12:53 AM > To: Fu, Siyuan > Cc: edk2-devel@lists.01.org; Ard Biesheuvel ; > Kinney, Michael D > Subject: Re: [PATCH v1] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP > with NetworkPkg drivers. >=20 > On Wed, Oct 31, 2018 at 11:38:51AM +0800, Fu Siyuan wrote: > > The PXE/iSCSI/TCP drivers in MdeModulePkg are going to be deprecated. > All > > platform DSC/FDF files should be updated to use the dual-stack drivers > in > > NetworkPkg. > > > > The NetworkPkg driver have all the functionality compared with > MdeModulePkg > > one, with more bug fixes and new feature added. While its image size > will > > be a little bigger because it contains both IPv4 and IPv6 stack support= , > > so it may cause build error in a platform if the flash space is very > tight. > > Basically, this patch won't cause any other problem if build could pass= . > > > > I haven't built all the updated platform because the repo ReadMe doesn'= t > > provide a method to build them on Windows Environment, so I would very > > appreciate if anybody can help to test the build or tell me how to buil= d > > it on Windows. >=20 > There are still some changes required to core ARM code to permit > building full platform ports with Visual Studio. And I wouldn't ask > you to set up a GCC windows development environment if you don't > already have one. >=20 > I have added some additional modifications required to permit all of > the platforms on master to build correctly after applying your > patch. You can find them in the top commit of > https://git.linaro.org/people/leif.lindholm/edk2- > platforms.git/log/?h=3Dnetworkpkg-fixups > (plus a line ending fixup required to make that patch apply cleanly). >=20 > Regards, >=20 > Leif >=20 > > Cc: Ard Biesheuvel > > Cc: Leif Lindholm > > Cc: Michael D Kinney > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Fu Siyuan > > --- > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--= - > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--= - > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--= - > > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--= - > > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 6 +++--= - > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++--= - > ---- > > Platform/Hisilicon/D03/D03.dsc | 4 ++-- > > Platform/Hisilicon/D03/D03.fdf | 4 ++-- > > Platform/Hisilicon/D05/D05.dsc | 9 +++--= - > --- > > Platform/Hisilicon/D05/D05.fdf | 9 +++--= - > --- > > Platform/Hisilicon/D06/D06.dsc | 9 +++--= - > --- > > Platform/Hisilicon/D06/D06.fdf | 9 +++--= - > --- > > Platform/Hisilicon/HiKey/HiKey.dsc | 4 ++-- > > Platform/Hisilicon/HiKey/HiKey.fdf | 4 ++-- > > Platform/Hisilicon/HiKey960/HiKey960.dsc | 4 ++-- > > Platform/Hisilicon/HiKey960/HiKey960.fdf | 4 ++-- > > Platform/LeMaker/CelloBoard/CelloBoard.dsc | 6 +++--= - > > Platform/LeMaker/CelloBoard/CelloBoard.fdf | 6 +++--= - > > Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 6 +++--= - > > Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf | 6 +++--= - > > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 ++-- > > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 ++-- > > 22 files changed, 58 insertions(+), 74 deletions(-) > > > > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > > index 9f9885fda8..51327a67df 100644 > > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc > > @@ -669,11 +669,11 @@ DEFINE DO_CAPSULE =3D FALSE > > } > > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > ## Bug https://bugs.linaro.org/show_bug.cgi?id=3D2239 > > -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > +# NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > > index 0394b8a96f..bf4e6f3283 100644 > > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf > > @@ -204,11 +204,11 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > ## Bug https://bugs.linaro.org/show_bug.cgi?id=3D2239 > > -# INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > +# INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf > b/Platform/ARM/SgiPkg/SgiPlatform.fdf > > index fd87563246..c9129841d7 100644 > > --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf > > +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf > > @@ -185,10 +185,10 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf > > > > [FV.FVMAIN_COMPACT] > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc > b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc > > index 05809559cd..b647f65ad1 100644 > > --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc > > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc > > @@ -21,10 +21,10 @@ > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > > > !if $(INCLUDE_TFTP_COMMAND) =3D=3D TRUE > > # > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > index 3a7dad442e..98b472a234 100644 > > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > @@ -422,10 +422,10 @@ > > MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > + NetworkPkg/IScsiDxe/IScsiDxe.inf > > !ifdef EDK2_ENABLE_SMSC_91X > > # SMSC LAN 91C111 > > EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf > > diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc > b/Platform/Comcast/RDKQemu/RDKQemu.dsc > > index 02ec53a85a..b36c7cb784 100644 > > --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc > > +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc > > @@ -357,18 +357,14 @@ > > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > + NetworkPkg/IScsiDxe/IScsiDxe.inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - NetworkPkg/TcpDxe/TcpDxe.inf > > NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - NetworkPkg/IScsiDxe/IScsiDxe.inf > > -!else > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > !endif > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > NetworkPkg/DnsDxe/DnsDxe.inf > > diff --git a/Platform/Hisilicon/D03/D03.dsc > b/Platform/Hisilicon/D03/D03.dsc > > index aa1da5d61f..23764ef0e9 100644 > > --- a/Platform/Hisilicon/D03/D03.dsc > > +++ b/Platform/Hisilicon/D03/D03.dsc > > @@ -414,9 +414,9 @@ > > MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > > > Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf > > > > diff --git a/Platform/Hisilicon/D03/D03.fdf > b/Platform/Hisilicon/D03/D03.fdf > > index f8a3c0cdaa..f453f9e463 100644 > > --- a/Platform/Hisilicon/D03/D03.fdf > > +++ b/Platform/Hisilicon/D03/D03.fdf > > @@ -252,9 +252,9 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > > > !ifdef $(FDT_ENABLE) > > INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.inf > > diff --git a/Platform/Hisilicon/D05/D05.dsc > b/Platform/Hisilicon/D05/D05.dsc > > index 1040466633..0688b21175 100644 > > --- a/Platform/Hisilicon/D05/D05.dsc > > +++ b/Platform/Hisilicon/D05/D05.dsc > > @@ -552,18 +552,15 @@ > > MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > + NetworkPkg/IScsiDxe/IScsiDxe.inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - NetworkPkg/TcpDxe/TcpDxe.inf > > NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!else > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > !endif > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > NetworkPkg/DnsDxe/DnsDxe.inf > > NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > > diff --git a/Platform/Hisilicon/D05/D05.fdf > b/Platform/Hisilicon/D05/D05.fdf > > index a933af3635..85dd791564 100644 > > --- a/Platform/Hisilicon/D05/D05.fdf > > +++ b/Platform/Hisilicon/D05/D05.fdf > > @@ -259,18 +259,15 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - INF NetworkPkg/TcpDxe/TcpDxe.inf > > INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!else > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > !endif > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > INF NetworkPkg/DnsDxe/DnsDxe.inf > > INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > > diff --git a/Platform/Hisilicon/D06/D06.dsc > b/Platform/Hisilicon/D06/D06.dsc > > index 1a479c160e..a9624e2581 100644 > > --- a/Platform/Hisilicon/D06/D06.dsc > > +++ b/Platform/Hisilicon/D06/D06.dsc > > @@ -372,18 +372,15 @@ > > MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > + NetworkPkg/IScsiDxe/IScsiDxe.inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - NetworkPkg/TcpDxe/TcpDxe.inf > > NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!else > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > !endif > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > NetworkPkg/DnsDxe/DnsDxe.inf > > NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > > diff --git a/Platform/Hisilicon/D06/D06.fdf > b/Platform/Hisilicon/D06/D06.fdf > > index b97c25d23f..fda29ab322 100644 > > --- a/Platform/Hisilicon/D06/D06.fdf > > +++ b/Platform/Hisilicon/D06/D06.fdf > > @@ -265,18 +265,15 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > > INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf > > - INF NetworkPkg/TcpDxe/TcpDxe.inf > > INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > -!else > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > !endif > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > > INF NetworkPkg/DnsDxe/DnsDxe.inf > > INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > > diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc > b/Platform/Hisilicon/HiKey/HiKey.dsc > > index 43bacfd146..38fee90269 100644 > > --- a/Platform/Hisilicon/HiKey/HiKey.dsc > > +++ b/Platform/Hisilicon/HiKey/HiKey.dsc > > @@ -241,10 +241,10 @@ > > MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > > MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > > > # > > # AX88772 Ethernet Driver > > diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf > b/Platform/Hisilicon/HiKey/HiKey.fdf > > index 577f05afb7..b0e533c5b1 100644 > > --- a/Platform/Hisilicon/HiKey/HiKey.fdf > > +++ b/Platform/Hisilicon/HiKey/HiKey.fdf > > @@ -164,10 +164,10 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > > INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > > > # > > # AX88772 Ethernet Driver for Apple Ethernet Adapter > > diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc > b/Platform/Hisilicon/HiKey960/HiKey960.dsc > > index 90a28b53cc..bd26b759dc 100644 > > --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc > > +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc > > @@ -224,10 +224,10 @@ > > MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > > MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > > > # > > # FAT filesystem + GPT/MBR partitioning > > diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf > b/Platform/Hisilicon/HiKey960/HiKey960.fdf > > index 61cbe4e8a7..d9fd796d7d 100644 > > --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf > > +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf > > @@ -158,10 +158,10 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > > INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > > > # > > # FAT filesystem + GPT/MBR partitioning > > diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc > b/Platform/LeMaker/CelloBoard/CelloBoard.dsc > > index 0ca027eced..2d48a65c00 100644 > > --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc > > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc > > @@ -600,10 +600,10 @@ DEFINE DO_FLASHER =3D FALSE > > MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > + NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf > b/Platform/LeMaker/CelloBoard/CelloBoard.fdf > > index e3a0915f5d..0f412ba90e 100644 > > --- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf > > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf > > @@ -190,10 +190,10 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.ds= c > b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc > > index 87799ee2f7..4cfbe19858 100644 > > --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc > > +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc > > @@ -599,11 +599,11 @@ DEFINE DO_FLASHER =3D FALSE > > } > > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > ## Bug https://bugs.linaro.org/show_bug.cgi?id=3D2239 > > -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > +# NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fd= f > b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf > > index e23533d1bd..2800d5d1f5 100644 > > --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf > > +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf > > @@ -202,11 +202,11 @@ READ_LOCK_STATUS =3D TRUE > > INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > ## Bug https://bugs.linaro.org/show_bug.cgi?id=3D2239 > > -# INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > +# INF NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > index ef5bcb757c..8d6b785d82 100644 > > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > @@ -473,8 +473,8 @@ > > MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + NetworkPkg/TcpDxe/TcpDxe.inf > > Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf > > Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf > > Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf > > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > > index c5fbef5681..5fd88bdb70 100644 > > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > > @@ -144,8 +144,8 @@ FvNameGuid =3D 5eda4200-2c5f-43cb-9da3- > 0baf74b1b30c > > INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > + INF NetworkPkg/TcpDxe/TcpDxe.inf > > INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf > > INF Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf > > INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf > > -- > > 2.19.1.windows.1 > >