* [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration.
@ 2018-11-07 8:01 Fu Siyuan
2018-11-07 8:01 ` [PATCH v2 1/2] Platform/Hisilicon: CRLF fixups for D05.dsc Fu Siyuan
2018-11-07 8:01 ` [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers Fu Siyuan
0 siblings, 2 replies; 10+ messages in thread
From: Fu Siyuan @ 2018-11-07 8:01 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney
Patch 1/2 fixes the line ending issue introduced by Ccommit 1a13dfd37fe7
("Hisilicon/D0x: Switch to generic PciHostBridge driver").
Patch 2/2 updates all platform DSC/FDF files for NetworkPkg migration.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Fu Siyuan (1):
Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg
drivers.
Leif Lindholm (1):
Platform/Hisilicon: CRLF fixups for D05.dsc
.../AMD/OverdriveBoard/OverdriveBoard.dsc | 6 ++---
.../AMD/OverdriveBoard/OverdriveBoard.fdf | 6 ++---
Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 ++---
.../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 +
.../ArmVExpress-networking.fdf.inc | 6 ++---
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++-----
Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++-----
Platform/Hisilicon/D03/D03.dsc | 4 +--
Platform/Hisilicon/D03/D03.fdf | 4 +--
Platform/Hisilicon/D05/D05.dsc | 25 ++++++++-----------
Platform/Hisilicon/D05/D05.fdf | 9 +++----
Platform/Hisilicon/D06/D06.dsc | 11 +++-----
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 | 11 +++++---
Platform/LeMaker/CelloBoard/CelloBoard.fdf | 6 ++---
.../Overdrive1000Board/Overdrive1000Board.dsc | 6 ++---
.../Overdrive1000Board/Overdrive1000Board.fdf | 6 ++---
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 +--
23 files changed, 75 insertions(+), 88 deletions(-)
--
2.19.1.windows.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 1/2] Platform/Hisilicon: CRLF fixups for D05.dsc 2018-11-07 8:01 [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration Fu Siyuan @ 2018-11-07 8:01 ` Fu Siyuan 2018-11-07 8:01 ` [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers Fu Siyuan 1 sibling, 0 replies; 10+ messages in thread From: Fu Siyuan @ 2018-11-07 8:01 UTC (permalink / raw) To: edk2-devel; +Cc: Leif Lindholm, Ard Biesheuvel, Michael D Kinney From: Leif Lindholm <leif.lindholm@linaro.org> Commit 1a13dfd37fe7 ("Hisilicon/D0x: Switch to generic PciHostBridge driver") introduced some incorrect line endings, fix those here. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Michael D Kinney <michael.d.kinney@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- Platform/Hisilicon/D05/D05.dsc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 1040466633..e5fb5411d7 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -97,10 +97,10 @@ LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf - PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf + PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBridgeLib.inf PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161xPciSegmentLib.inf - PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf + PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi161xPciPlatformLib.inf [LibraryClasses.common.SEC] ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLibSec.inf @@ -138,7 +138,7 @@ [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdCoreCount|8 - gArmTokenSpaceGuid.PcdPciIoTranslation|0 + gArmTokenSpaceGuid.PcdPciIoTranslation|0 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 @@ -477,7 +477,7 @@ ArmPkg/Drivers/CpuDxe/CpuDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf - ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf @@ -618,10 +618,10 @@ <LibraryClasses> NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf } - Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { + Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { <LibraryClasses> - NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf - } + NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf + } MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { <LibraryClasses> NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf -- 2.19.1.windows.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-07 8:01 [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration Fu Siyuan 2018-11-07 8:01 ` [PATCH v2 1/2] Platform/Hisilicon: CRLF fixups for D05.dsc Fu Siyuan @ 2018-11-07 8:01 ` Fu Siyuan 1 sibling, 0 replies; 10+ messages in thread From: Fu Siyuan @ 2018-11-07 8:01 UTC (permalink / raw) To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney V2: Additional fixups required for NetworkPkg migration 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 build it on Windows. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Michael D Kinney <michael.d.kinney@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++++------ Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++------- Platform/Hisilicon/D03/D03.dsc | 4 ++-- Platform/Hisilicon/D03/D03.fdf | 4 ++-- Platform/Hisilicon/D05/D05.dsc | 11 +++-------- Platform/Hisilicon/D05/D05.fdf | 9 +++------ Platform/Hisilicon/D06/D06.dsc | 11 +++-------- 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 | 11 ++++++++--- 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 ++-- 23 files changed, 68 insertions(+), 81 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 = 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=2239 -# 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 = 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=2239 -# 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 = 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-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 617164d42a..0542808f7d 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -58,6 +58,7 @@ ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf [LibraryClasses.ARM] + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf # # PSCI support in EL3 may not be available if we are not running under a PSCI # compliant secure firmware. Assume PSCI on AARCH64, and fall back to the 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) == TRUE # diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 3a7dad442e..752e525c34 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -65,6 +65,7 @@ DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf @@ -126,11 +127,8 @@ # Secure Boot dependencies # !if $(SECURE_BOOT_ENABLE) == TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf @@ -138,6 +136,9 @@ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf @@ -422,10 +423,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) == 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) == 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 = 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 e5fb5411d7..ee306a8be5 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -56,9 +56,7 @@ BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif !if $(HTTP_BOOT_ENABLE) == TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf @@ -552,18 +550,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) == 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) == 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 = 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) == 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) == 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..e8bf558257 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -56,9 +56,7 @@ BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif !if $(HTTP_BOOT_ENABLE) == TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf @@ -372,18 +370,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) == 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) == 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 = 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) == 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) == 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 = 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 = 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..e63cda1af9 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -80,6 +80,7 @@ DEFINE DO_FLASHER = FALSE # Networking Requirements NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf @@ -144,6 +145,10 @@ DEFINE DO_FLASHER = FALSE SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + [LibraryClasses.common.SEC] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf @@ -600,10 +605,10 @@ DEFINE DO_FLASHER = 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 = 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.dsc 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 = 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=2239 -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +# NetworkPkg/IScsiDxe/IScsiDxe.inf # # Core Info diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf 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 = 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=2239 -# 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 = 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 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration.
@ 2018-11-05 1:33 Fu Siyuan
2018-11-05 1:33 ` [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers Fu Siyuan
0 siblings, 1 reply; 10+ messages in thread
From: Fu Siyuan @ 2018-11-05 1:33 UTC (permalink / raw)
To: edk2-devel
Patch 1/2 fixes the line ending issue introduced by Ccommit 1a13dfd37fe7
("Hisilicon/D0x: Switch to generic PciHostBridge driver").
Patch 2/2 updates all platform DSC/FDF files for NetworkPkg migration.
Fu Siyuan (1):
Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg
drivers.
Leif Lindholm (1):
Platform/Hisilicon: CRLF fixups for D05.dsc
.../AMD/OverdriveBoard/OverdriveBoard.dsc | 6 ++---
.../AMD/OverdriveBoard/OverdriveBoard.fdf | 6 ++---
Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 ++---
.../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 +
.../ArmVExpress-networking.fdf.inc | 6 ++---
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++-----
Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++-----
Platform/Hisilicon/D03/D03.dsc | 4 +--
Platform/Hisilicon/D03/D03.fdf | 4 +--
Platform/Hisilicon/D05/D05.dsc | 25 ++++++++-----------
Platform/Hisilicon/D05/D05.fdf | 9 +++----
Platform/Hisilicon/D06/D06.dsc | 11 +++-----
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 | 11 +++++---
Platform/LeMaker/CelloBoard/CelloBoard.fdf | 6 ++---
.../Overdrive1000Board/Overdrive1000Board.dsc | 6 ++---
.../Overdrive1000Board/Overdrive1000Board.fdf | 6 ++---
Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +--
Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 +--
23 files changed, 75 insertions(+), 88 deletions(-)
--
2.19.1.windows.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-05 1:33 [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration Fu Siyuan @ 2018-11-05 1:33 ` Fu Siyuan 2018-11-07 8:12 ` Fu, Siyuan 0 siblings, 1 reply; 10+ messages in thread From: Fu Siyuan @ 2018-11-05 1:33 UTC (permalink / raw) To: edk2-devel; +Cc: Ard Biesheuvel, Leif Lindholm, Michael D Kinney V2: Additional fixups required for NetworkPkg migration 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 build it on Windows. Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Michael D Kinney <michael.d.kinney@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++++------ Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++------- Platform/Hisilicon/D03/D03.dsc | 4 ++-- Platform/Hisilicon/D03/D03.fdf | 4 ++-- Platform/Hisilicon/D05/D05.dsc | 11 +++-------- Platform/Hisilicon/D05/D05.fdf | 9 +++------ Platform/Hisilicon/D06/D06.dsc | 11 +++-------- 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 | 11 ++++++++--- 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 ++-- 23 files changed, 68 insertions(+), 81 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 = 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=2239 -# 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 = 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=2239 -# 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 = 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-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 617164d42a..0542808f7d 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -58,6 +58,7 @@ ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf [LibraryClasses.ARM] + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf # # PSCI support in EL3 may not be available if we are not running under a PSCI # compliant secure firmware. Assume PSCI on AARCH64, and fall back to the 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) == TRUE # diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 3a7dad442e..752e525c34 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -65,6 +65,7 @@ DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf @@ -126,11 +127,8 @@ # Secure Boot dependencies # !if $(SECURE_BOOT_ENABLE) == TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf @@ -138,6 +136,9 @@ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf @@ -422,10 +423,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) == 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) == 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 = 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 e5fb5411d7..ee306a8be5 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -56,9 +56,7 @@ BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif !if $(HTTP_BOOT_ENABLE) == TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf @@ -552,18 +550,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) == 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) == 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 = 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) == 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) == 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..e8bf558257 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -56,9 +56,7 @@ BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif !if $(HTTP_BOOT_ENABLE) == TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf @@ -372,18 +370,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) == 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) == 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 = 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) == 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) == 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 = 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 = 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..e63cda1af9 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -80,6 +80,7 @@ DEFINE DO_FLASHER = FALSE # Networking Requirements NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf @@ -144,6 +145,10 @@ DEFINE DO_FLASHER = FALSE SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + [LibraryClasses.common.SEC] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf @@ -600,10 +605,10 @@ DEFINE DO_FLASHER = 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 = 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.dsc 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 = 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=2239 -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf +# NetworkPkg/IScsiDxe/IScsiDxe.inf # # Core Info diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf 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 = 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=2239 -# 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 = 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 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-05 1:33 ` [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers Fu Siyuan @ 2018-11-07 8:12 ` Fu, Siyuan 2018-11-07 8:25 ` Leif Lindholm 0 siblings, 1 reply; 10+ messages in thread From: Fu, Siyuan @ 2018-11-07 8:12 UTC (permalink / raw) To: Leif Lindholm, Ard Biesheuvel Cc: Kinney, Michael D, edk2-devel@lists.01.org, Fu, Siyuan Hi, Leif and Ard I just realized that you may not be CCed in this email. I resent these patches a few minutes ago, my Git Bash send-email reports it added you to CC receiver, but the Outlook received email still doesn't have your name in CC list. Do you have any comments for this v2 patch of the edk2platforms? BestRegards Fu Siyuan > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Fu > Siyuan > Sent: Monday, November 5, 2018 9:33 AM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > Subject: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > PXE/iSCSI/TCP with NetworkPkg drivers. > > V2: > Additional fixups required for NetworkPkg migration > > 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 build > it on Windows. > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Leif Lindholm <leif.lindholm@linaro.org> > Cc: Michael D Kinney <michael.d.kinney@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > --- > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++++- > ----- > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++----- > -- > Platform/Hisilicon/D03/D03.dsc | 4 ++-- > Platform/Hisilicon/D03/D03.fdf | 4 ++-- > Platform/Hisilicon/D05/D05.dsc | 11 +++----- > --- > Platform/Hisilicon/D05/D05.fdf | 9 +++----- > - > Platform/Hisilicon/D06/D06.dsc | 11 +++----- > --- > 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 | 11 > ++++++++--- > 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 ++-- > 23 files changed, 68 insertions(+), 81 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 = 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=2239 > -# 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 = 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=2239 > -# 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 = 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-CTA15-A7.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index 617164d42a..0542808f7d 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -58,6 +58,7 @@ > > ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysCon > figRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf > > [LibraryClasses.ARM] > + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf > # > # PSCI support in EL3 may not be available if we are not running under > a PSCI > # compliant secure firmware. Assume PSCI on AARCH64, and fall back to > the > 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) == TRUE > # > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > index 3a7dad442e..752e525c34 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > @@ -65,6 +65,7 @@ > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > # ARM Architectural Libraries > > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintena > nceLib.inf > @@ -126,11 +127,8 @@ > # Secure Boot dependencies > # > !if $(SECURE_BOOT_ENABLE) == TRUE > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasureme > ntLib.inf > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > # re-use the UserPhysicalPresent() dummy implementation from the ovmf > tree > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > @@ -138,6 +136,9 @@ > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasuremen > tLibNull.inf > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNu > ll.inf > !endif > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf > @@ -422,10 +423,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) == 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) == 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 = 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 e5fb5411d7..ee306a8be5 100644 > --- a/Platform/Hisilicon/D05/D05.dsc > +++ b/Platform/Hisilicon/D05/D05.dsc > @@ -56,9 +56,7 @@ > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > -!if $(NETWORK_IP6_ENABLE) == TRUE > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > -!endif > > !if $(HTTP_BOOT_ENABLE) == TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > @@ -552,18 +550,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) == 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) == 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 = 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) == 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) == 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..e8bf558257 100644 > --- a/Platform/Hisilicon/D06/D06.dsc > +++ b/Platform/Hisilicon/D06/D06.dsc > @@ -56,9 +56,7 @@ > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > -!if $(NETWORK_IP6_ENABLE) == TRUE > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > -!endif > > !if $(HTTP_BOOT_ENABLE) == TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > @@ -372,18 +370,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) == 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) == 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 = 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) == 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) == 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 = 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 = 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..e63cda1af9 100644 > --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc > @@ -80,6 +80,7 @@ DEFINE DO_FLASHER = FALSE > # Networking Requirements > NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > > @@ -144,6 +145,10 @@ DEFINE DO_FLASHER = FALSE > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > + > [LibraryClasses.common.SEC] > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiSe > rvicesTablePointerLib.inf > @@ -600,10 +605,10 @@ DEFINE DO_FLASHER = 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 = 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.dsc > 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 = 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=2239 > -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > +# NetworkPkg/IScsiDxe/IScsiDxe.inf > > # > # Core Info > diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf > 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 = 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=2239 > -# 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 = 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 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-07 8:12 ` Fu, Siyuan @ 2018-11-07 8:25 ` Leif Lindholm 2018-11-09 13:55 ` Thomas Abraham 0 siblings, 1 reply; 10+ messages in thread From: Leif Lindholm @ 2018-11-07 8:25 UTC (permalink / raw) To: Fu, Siyuan; +Cc: Ard Biesheuvel, Kinney, Michael D, edk2-devel@lists.01.org Hi Fu Siyan, On Wed, Nov 07, 2018 at 08:12:55AM +0000, Fu, Siyuan wrote: > Hi, Leif and Ard > > I just realized that you may not be CCed in this email. I resent these patches a few minutes ago, my Git Bash send-email reports it added you to CC receiver, but the Outlook received email still doesn't have your name in CC list. > > Do you have any comments for this v2 patch of the edk2platforms? > > > BestRegards > Fu Siyuan > > > -----Original Message----- > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Fu > > Siyuan > > Sent: Monday, November 5, 2018 9:33 AM > > To: edk2-devel@lists.01.org > > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > > Subject: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > > PXE/iSCSI/TCP with NetworkPkg drivers. > > > > V2: > > Additional fixups required for NetworkPkg migration Revision history like this belongs in the cover letter. > > 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 build > > it on Windows. And comments like the paragraph above belong in the cover letter or below the --- If you are OK with me deleting these bits before committing: Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> / Leif > > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > --- > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- > > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + > > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- > > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++++- > > ----- > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++----- > > -- > > Platform/Hisilicon/D03/D03.dsc | 4 ++-- > > Platform/Hisilicon/D03/D03.fdf | 4 ++-- > > Platform/Hisilicon/D05/D05.dsc | 11 +++----- > > --- > > Platform/Hisilicon/D05/D05.fdf | 9 +++----- > > - > > Platform/Hisilicon/D06/D06.dsc | 11 +++----- > > --- > > 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 | 11 > > ++++++++--- > > 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 ++-- > > 23 files changed, 68 insertions(+), 81 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 = 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=2239 > > -# 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 = 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=2239 > > -# 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 = 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-CTA15-A7.dsc > > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > > index 617164d42a..0542808f7d 100644 > > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > > @@ -58,6 +58,7 @@ > > > > ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysCon > > figRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf > > > > [LibraryClasses.ARM] > > + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf > > # > > # PSCI support in EL3 may not be available if we are not running under > > a PSCI > > # compliant secure firmware. Assume PSCI on AARCH64, and fall back to > > the > > 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) == TRUE > > # > > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > index 3a7dad442e..752e525c34 100644 > > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > > @@ -65,6 +65,7 @@ > > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > > UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > > IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > > > # ARM Architectural Libraries > > > > CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintena > > nceLib.inf > > @@ -126,11 +127,8 @@ > > # Secure Boot dependencies > > # > > !if $(SECURE_BOOT_ENABLE) == TRUE > > - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > > > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasureme > > ntLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > > - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > > > # re-use the UserPhysicalPresent() dummy implementation from the ovmf > > tree > > > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > @@ -138,6 +136,9 @@ > > > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasuremen > > tLibNull.inf > > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNu > > ll.inf > > !endif > > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf > > > > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf > > @@ -422,10 +423,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) == 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) == 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 = 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 e5fb5411d7..ee306a8be5 100644 > > --- a/Platform/Hisilicon/D05/D05.dsc > > +++ b/Platform/Hisilicon/D05/D05.dsc > > @@ -56,9 +56,7 @@ > > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > > > -!if $(NETWORK_IP6_ENABLE) == TRUE > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!endif > > > > !if $(HTTP_BOOT_ENABLE) == TRUE > > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > > @@ -552,18 +550,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) == 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) == 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 = 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) == 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) == 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..e8bf558257 100644 > > --- a/Platform/Hisilicon/D06/D06.dsc > > +++ b/Platform/Hisilicon/D06/D06.dsc > > @@ -56,9 +56,7 @@ > > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > > > -!if $(NETWORK_IP6_ENABLE) == TRUE > > TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > -!endif > > > > !if $(HTTP_BOOT_ENABLE) == TRUE > > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > > @@ -372,18 +370,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) == 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) == 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 = 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) == 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) == 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 = 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 = 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..e63cda1af9 100644 > > --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc > > +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc > > @@ -80,6 +80,7 @@ DEFINE DO_FLASHER = FALSE > > # Networking Requirements > > NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > > DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > > UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > > IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > > > > @@ -144,6 +145,10 @@ DEFINE DO_FLASHER = FALSE > > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > > > > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > > > > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > + > > [LibraryClasses.common.SEC] > > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > > > > PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiSe > > rvicesTablePointerLib.inf > > @@ -600,10 +605,10 @@ DEFINE DO_FLASHER = 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 = 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.dsc > > 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 = 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=2239 > > -# MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > > +# NetworkPkg/IScsiDxe/IScsiDxe.inf > > > > # > > # Core Info > > diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf > > 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 = 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=2239 > > -# 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 = 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 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-07 8:25 ` Leif Lindholm @ 2018-11-09 13:55 ` Thomas Abraham 2018-11-12 0:55 ` Fu, Siyuan 2018-11-27 8:47 ` Fu, Siyuan 0 siblings, 2 replies; 10+ messages in thread From: Thomas Abraham @ 2018-11-09 13:55 UTC (permalink / raw) To: Leif Lindholm; +Cc: siyuan.fu, michael.d.kinney, edk2-devel On Wed, Nov 7, 2018 at 1:55 PM Leif Lindholm <leif.lindholm@linaro.org> wrote: > > Hi Fu Siyan, > > On Wed, Nov 07, 2018 at 08:12:55AM +0000, Fu, Siyuan wrote: > > Hi, Leif and Ard > > > > I just realized that you may not be CCed in this email. I resent these patches a few minutes ago, my Git Bash send-email reports it added you to CC receiver, but the Outlook received email still doesn't have your name in CC list. > > > > Do you have any comments for this v2 patch of the edk2platforms? > > > > > > BestRegards > > Fu Siyuan > > > > > -----Original Message----- > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Fu > > > Siyuan > > > Sent: Monday, November 5, 2018 9:33 AM > > > To: edk2-devel@lists.01.org > > > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > > > Subject: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > > > PXE/iSCSI/TCP with NetworkPkg drivers. > > > > > > V2: > > > Additional fixups required for NetworkPkg migration > > Revision history like this belongs in the cover letter. > > > > 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 build > > > it on Windows. > > And comments like the paragraph above belong in the cover letter or > below the --- > If you are OK with me deleting these bits before committing: > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > / > Leif > > > > > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> > > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > > --- > > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- > > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- > > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- > > > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + > > > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- > > > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 +++++++- > > > ----- > > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++----- > > > -- > > > Platform/Hisilicon/D03/D03.dsc | 4 ++-- > > > Platform/Hisilicon/D03/D03.fdf | 4 ++-- > > > Platform/Hisilicon/D05/D05.dsc | 11 +++----- > > > --- > > > Platform/Hisilicon/D05/D05.fdf | 9 +++----- > > > - > > > Platform/Hisilicon/D06/D06.dsc | 11 +++----- > > > --- > > > 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 | 11 > > > ++++++++--- > > > 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 ++-- > > > 23 files changed, 68 insertions(+), 81 deletions(-) > > > [...] > > > # > > > # 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 = 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 > > > [...] On SGI platforms, the above change causes a crash (Synchronous Exception). This issue is yet to be debugged but initial observations are the following messages on the console. Loading driver at 0x000F7FFC000 EntryPoint=0x000F800B2AC IScsiDxe.efi InstallProtocolInterface: input handle at 0xFE229C98 is invalid InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 F801AA18 failed with Invalid Parameter Error: Image at 000F7FFC000 start failed: Invalid Parameter remove-symbol-file /home/thopan01/devel/sgi/upstream-dev/uefi/edk2/Build/ArmSgi/DEBUG_GCC5/AARCH64/NetworkPkg/IScsiDxe/IScsiDxe/DEBUG/IScsiDxe.dll 0xF7FFD000 and then later crashes in the "PlatformBootManagerBeforeConsole" function in "ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c" file. This issue will be debugged. If there are any suggestions on possible fixes, please let me know. Thanks, Thomas. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-09 13:55 ` Thomas Abraham @ 2018-11-12 0:55 ` Fu, Siyuan 2018-11-27 8:47 ` Fu, Siyuan 1 sibling, 0 replies; 10+ messages in thread From: Fu, Siyuan @ 2018-11-12 0:55 UTC (permalink / raw) To: Thomas Abraham, Leif Lindholm; +Cc: Kinney, Michael D, edk2-devel@lists.01.org Hi, Thomas > -----Original Message----- > From: Thomas Abraham [mailto:thomas.abraham@arm.com] > Sent: Friday, November 9, 2018 9:56 PM > To: Leif Lindholm <leif.lindholm@linaro.org> > Cc: Fu, Siyuan <siyuan.fu@intel.com>; Kinney, Michael D > <michael.d.kinney@intel.com>; edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > PXE/iSCSI/TCP with NetworkPkg drivers. > > On Wed, Nov 7, 2018 at 1:55 PM Leif Lindholm <leif.lindholm@linaro.org> > wrote: > > > > Hi Fu Siyan, > > > > On Wed, Nov 07, 2018 at 08:12:55AM +0000, Fu, Siyuan wrote: > > > Hi, Leif and Ard > > > > > > I just realized that you may not be CCed in this email. I resent these > patches a few minutes ago, my Git Bash send-email reports it added you to > CC receiver, but the Outlook received email still doesn't have your name > in CC list. > > > > > > Do you have any comments for this v2 patch of the edk2platforms? > > > > > > > > > BestRegards > > > Fu Siyuan > > > > > > > -----Original Message----- > > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf > Of Fu > > > > Siyuan > > > > Sent: Monday, November 5, 2018 9:33 AM > > > > To: edk2-devel@lists.01.org > > > > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > > > > Subject: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > > > > PXE/iSCSI/TCP with NetworkPkg drivers. > > > > > > > > V2: > > > > Additional fixups required for NetworkPkg migration > > > > Revision history like this belongs in the cover letter. > > > > > > 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 > build > > > > it on Windows. > > > > And comments like the paragraph above belong in the cover letter or > > below the --- > > If you are OK with me deleting these bits before committing: > > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > > > / > > Leif > > > > > > > > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> > > > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > > > --- > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 > +++--- > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 > +++--- > > > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 > +++--- > > > > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + > > > > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 > +++--- > > > > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 > +++++++- > > > > ----- > > > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 > +++----- > > > > -- > > > > Platform/Hisilicon/D03/D03.dsc | 4 > ++-- > > > > Platform/Hisilicon/D03/D03.fdf | 4 > ++-- > > > > Platform/Hisilicon/D05/D05.dsc | 11 > +++----- > > > > --- > > > > Platform/Hisilicon/D05/D05.fdf | 9 > +++----- > > > > - > > > > Platform/Hisilicon/D06/D06.dsc | 11 > +++----- > > > > --- > > > > 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 | 11 > > > > ++++++++--- > > > > 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 > ++-- > > > > 23 files changed, 68 insertions(+), 81 deletions(-) > > > > > > [...] > > > > > # > > > > # 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 = 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 > > > > > > [...] > > On SGI platforms, the above change causes a crash (Synchronous > Exception). This issue is yet to be debugged but initial observations > are the following messages on the console. > > Loading driver at 0x000F7FFC000 EntryPoint=0x000F800B2AC IScsiDxe.efi > InstallProtocolInterface: input handle at 0xFE229C98 is invalid > InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 > F801AA18 failed with Invalid Parameter > Error: Image at 000F7FFC000 start failed: Invalid Parameter > remove-symbol-file > /home/thopan01/devel/sgi/upstream- > dev/uefi/edk2/Build/ArmSgi/DEBUG_GCC5/AARCH64/NetworkPkg/IScsiDxe/IScsiDxe > /DEBUG/IScsiDxe.dll > 0xF7FFD000 It looks like the iSCSI driver meet error when trying to install the driver binding protocol. It happens in the first few lines of the driver entry point and one of an EFI Handle is considered as an invalid handle by the EFI core service. Could you please add some debug info to check which one is the invalid handle "input handle at 0xFE229C98 is invalid"? > > and then later crashes in the "PlatformBootManagerBeforeConsole" > function in "ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c" file. > > This issue will be debugged. If there are any suggestions on possible > fixes, please let me know. > > Thanks, > Thomas. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-09 13:55 ` Thomas Abraham 2018-11-12 0:55 ` Fu, Siyuan @ 2018-11-27 8:47 ` Fu, Siyuan 2018-11-27 9:23 ` Thomas Abraham 1 sibling, 1 reply; 10+ messages in thread From: Fu, Siyuan @ 2018-11-27 8:47 UTC (permalink / raw) To: Thomas Abraham, Leif Lindholm; +Cc: Kinney, Michael D, edk2-devel@lists.01.org Hi, Thomas > -----Original Message----- > From: Thomas Abraham [mailto:thomas.abraham@arm.com] > Sent: Friday, November 9, 2018 9:56 PM > To: Leif Lindholm <leif.lindholm@linaro.org> > Cc: Fu, Siyuan <siyuan.fu@intel.com>; Kinney, Michael D > <michael.d.kinney@intel.com>; edk2-devel@lists.01.org > Subject: Re: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > PXE/iSCSI/TCP with NetworkPkg drivers. > > On Wed, Nov 7, 2018 at 1:55 PM Leif Lindholm <leif.lindholm@linaro.org> wrote: > > > > Hi Fu Siyan, > > > > On Wed, Nov 07, 2018 at 08:12:55AM +0000, Fu, Siyuan wrote: > > > Hi, Leif and Ard > > > > > > I just realized that you may not be CCed in this email. I resent these > patches a few minutes ago, my Git Bash send-email reports it added you to CC > receiver, but the Outlook received email still doesn't have your name in CC > list. > > > > > > Do you have any comments for this v2 patch of the edk2platforms? > > > > > > > > > BestRegards > > > Fu Siyuan > > > > > > > -----Original Message----- > > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Fu > > > > Siyuan > > > > Sent: Monday, November 5, 2018 9:33 AM > > > > To: edk2-devel@lists.01.org > > > > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > > > > Subject: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > > > > PXE/iSCSI/TCP with NetworkPkg drivers. > > > > > > > > V2: > > > > Additional fixups required for NetworkPkg migration > > > > Revision history like this belongs in the cover letter. > > > > > > 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 build > > > > it on Windows. > > > > And comments like the paragraph above belong in the cover letter or > > below the --- > > If you are OK with me deleting these bits before committing: > > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > > > / > > Leif > > > > > > > > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> > > > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > > > --- > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- > > > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- > > > > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + > > > > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- > > > > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 > +++++++- > > > > ----- > > > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++--- > -- > > > > -- > > > > Platform/Hisilicon/D03/D03.dsc | 4 ++-- > > > > Platform/Hisilicon/D03/D03.fdf | 4 ++-- > > > > Platform/Hisilicon/D05/D05.dsc | 11 +++--- > -- > > > > --- > > > > Platform/Hisilicon/D05/D05.fdf | 9 +++--- > -- > > > > - > > > > Platform/Hisilicon/D06/D06.dsc | 11 +++--- > -- > > > > --- > > > > 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 | 11 > > > > ++++++++--- > > > > 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 ++-- > > > > 23 files changed, 68 insertions(+), 81 deletions(-) > > > > > > [...] > > > > > # > > > > # 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 = 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 > > > > > > [...] > > On SGI platforms, the above change causes a crash (Synchronous > Exception). This issue is yet to be debugged but initial observations > are the following messages on the console. > > Loading driver at 0x000F7FFC000 EntryPoint=0x000F800B2AC IScsiDxe.efi > InstallProtocolInterface: input handle at 0xFE229C98 is invalid > InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 > F801AA18 failed with Invalid Parameter > Error: Image at 000F7FFC000 start failed: Invalid Parameter > remove-symbol-file > /home/thopan01/devel/sgi/upstream- > dev/uefi/edk2/Build/ArmSgi/DEBUG_GCC5/AARCH64/NetworkPkg/IScsiDxe/IScsiDxe/DEB > UG/IScsiDxe.dll > 0xF7FFD000 > > and then later crashes in the "PlatformBootManagerBeforeConsole" > function in "ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c" file. > > This issue will be debugged. If there are any suggestions on possible > fixes, please let me know. Have you root caused this issue for your SGI platform? Can I commit this patch for Edk2Platforms repo? I plan to remove the MdeModulePkg PXE/iSCSI/TCP drivers and Edk2Platforms need to be updated before that. Thanks. > > Thanks, > Thomas. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers. 2018-11-27 8:47 ` Fu, Siyuan @ 2018-11-27 9:23 ` Thomas Abraham 0 siblings, 0 replies; 10+ messages in thread From: Thomas Abraham @ 2018-11-27 9:23 UTC (permalink / raw) To: siyuan.fu; +Cc: Leif Lindholm, michael.d.kinney, edk2-devel Hi Siyuan, On Tue, Nov 27, 2018 at 2:22 PM Fu, Siyuan <siyuan.fu@intel.com> wrote: > > Hi, Thomas > > > -----Original Message----- > > From: Thomas Abraham [mailto:thomas.abraham@arm.com] > > Sent: Friday, November 9, 2018 9:56 PM > > To: Leif Lindholm <leif.lindholm@linaro.org> > > Cc: Fu, Siyuan <siyuan.fu@intel.com>; Kinney, Michael D > > <michael.d.kinney@intel.com>; edk2-devel@lists.01.org > > Subject: Re: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > > PXE/iSCSI/TCP with NetworkPkg drivers. > > > > On Wed, Nov 7, 2018 at 1:55 PM Leif Lindholm <leif.lindholm@linaro.org> wrote: > > > > > > Hi Fu Siyan, > > > > > > On Wed, Nov 07, 2018 at 08:12:55AM +0000, Fu, Siyuan wrote: > > > > Hi, Leif and Ard > > > > > > > > I just realized that you may not be CCed in this email. I resent these > > patches a few minutes ago, my Git Bash send-email reports it added you to CC > > receiver, but the Outlook received email still doesn't have your name in CC > > list. > > > > > > > > Do you have any comments for this v2 patch of the edk2platforms? > > > > > > > > > > > > BestRegards > > > > Fu Siyuan > > > > > > > > > -----Original Message----- > > > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > > Fu > > > > > Siyuan > > > > > Sent: Monday, November 5, 2018 9:33 AM > > > > > To: edk2-devel@lists.01.org > > > > > Cc: Kinney, Michael D <michael.d.kinney@intel.com> > > > > > Subject: [edk2] [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg > > > > > PXE/iSCSI/TCP with NetworkPkg drivers. > > > > > > > > > > V2: > > > > > Additional fixups required for NetworkPkg migration > > > > > > Revision history like this belongs in the cover letter. > > > > > > > > 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 build > > > > > it on Windows. > > > > > > And comments like the paragraph above belong in the cover letter or > > > below the --- > > > If you are OK with me deleting these bits before committing: > > > Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> > > > > > > / > > > Leif > > > > > > > > > > > > > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > > > > > Cc: Leif Lindholm <leif.lindholm@linaro.org> > > > > > Cc: Michael D Kinney <michael.d.kinney@intel.com> > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > > Signed-off-by: Fu Siyuan <siyuan.fu@intel.com> > > > > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > > > > --- > > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 6 +++--- > > > > > Platform/AMD/OverdriveBoard/OverdriveBoard.fdf | 6 +++--- > > > > > Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 +++--- > > > > > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 + > > > > > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 6 +++--- > > > > > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 13 > > +++++++- > > > > > ----- > > > > > Platform/Comcast/RDKQemu/RDKQemu.dsc | 10 +++--- > > -- > > > > > -- > > > > > Platform/Hisilicon/D03/D03.dsc | 4 ++-- > > > > > Platform/Hisilicon/D03/D03.fdf | 4 ++-- > > > > > Platform/Hisilicon/D05/D05.dsc | 11 +++--- > > -- > > > > > --- > > > > > Platform/Hisilicon/D05/D05.fdf | 9 +++--- > > -- > > > > > - > > > > > Platform/Hisilicon/D06/D06.dsc | 11 +++--- > > -- > > > > > --- > > > > > 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 | 11 > > > > > ++++++++--- > > > > > 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 ++-- > > > > > 23 files changed, 68 insertions(+), 81 deletions(-) > > > > > > > > > [...] > > > > > > > # > > > > > # 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 = 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 > > > > > > > > > [...] > > > > On SGI platforms, the above change causes a crash (Synchronous > > Exception). This issue is yet to be debugged but initial observations > > are the following messages on the console. > > > > Loading driver at 0x000F7FFC000 EntryPoint=0x000F800B2AC IScsiDxe.efi > > InstallProtocolInterface: input handle at 0xFE229C98 is invalid > > InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 > > F801AA18 failed with Invalid Parameter > > Error: Image at 000F7FFC000 start failed: Invalid Parameter > > remove-symbol-file > > /home/thopan01/devel/sgi/upstream- > > dev/uefi/edk2/Build/ArmSgi/DEBUG_GCC5/AARCH64/NetworkPkg/IScsiDxe/IScsiDxe/DEB > > UG/IScsiDxe.dll > > 0xF7FFD000 > > > > and then later crashes in the "PlatformBootManagerBeforeConsole" > > function in "ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c" file. > > > > This issue will be debugged. If there are any suggestions on possible > > fixes, please let me know. > > Have you root caused this issue for your SGI platform? Can I commit this > patch for Edk2Platforms repo? I plan to remove the MdeModulePkg PXE/iSCSI/TCP > drivers and Edk2Platforms need to be updated before that. Yes, the issue has been root caused and fixed. The issue was related to use of a variable of size 4K in iSCSI driver whereas the SGI platform had a limit of 1K for the variable. The patch to fix this issue is merged in edk2-platforms repo. Thanks, Thomas. > > Thanks. > > > > > Thanks, > > Thomas. > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-11-27 9:23 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-11-07 8:01 [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration Fu Siyuan 2018-11-07 8:01 ` [PATCH v2 1/2] Platform/Hisilicon: CRLF fixups for D05.dsc Fu Siyuan 2018-11-07 8:01 ` [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers Fu Siyuan -- strict thread matches above, loose matches on Subject: below -- 2018-11-05 1:33 [PATCH v2 0/2] Update platform DSC/FDF files for NetworkPkg migration Fu Siyuan 2018-11-05 1:33 ` [PATCH v2 2/2] Edk2Platforms: Replace MdeModulePkg PXE/iSCSI/TCP with NetworkPkg drivers Fu Siyuan 2018-11-07 8:12 ` Fu, Siyuan 2018-11-07 8:25 ` Leif Lindholm 2018-11-09 13:55 ` Thomas Abraham 2018-11-12 0:55 ` Fu, Siyuan 2018-11-27 8:47 ` Fu, Siyuan 2018-11-27 9:23 ` Thomas Abraham
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox