ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.

This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those
ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively
maintained and will be removed from edk2 master soon.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index fbdb5c9826048980651647a2471a34e8399393f7..c3549c84d4c6aa9649ca012cbc012a48eb6eab58 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -149,11 +149,9 @@
   #\r
   # CryptoPkg libraries needed by multiple firmware features\r
   #\r
-!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
-!endif\r
 \r
   #\r
   # Secure Boot dependencies\r

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index a107b6bb510411d39cdb6d284ee44c6e231eb77e..aec92c191eca90c62ae09fd697fd3c8e2df502f2 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -342,18 +342,14 @@
   MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
   NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
   NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
   NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 !endif\r
 !if $(HTTP_BOOT_ENABLE) == TRUE\r
   NetworkPkg/DnsDxe/DnsDxe.inf\r

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index a6390bd4b8419d64458023f3810b5b12ebbe6c5e..3316f982695fa57f0fd198c78422ea4b1d2320ef 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -126,18 +126,14 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  INF NetworkPkg/IScsiDxe/IScsiDxe.inf\r
+  INF NetworkPkg/TcpDxe/TcpDxe.inf\r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
   INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  INF NetworkPkg/TcpDxe/TcpDxe.inf\r
   INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
   INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 !endif\r
 !if $(HTTP_BOOT_ENABLE) == TRUE\r
   INF NetworkPkg/DnsDxe/DnsDxe.inf\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index df125cfef646d186cfc2e4d6c0594e2bbc96eb6e..812c71e772eca9c37fcd752581751c95954f85db 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -67,6 +67,9 @@
 \r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
 \r
 [BuildOptions.common.EDKII.SEC, BuildOptions.common.EDKII.BASE]\r
   #\r
@@ -332,18 +335,14 @@
   MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
   NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
   NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
   NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
-  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 !endif\r
 !if $(HTTP_BOOT_ENABLE) == TRUE\r
   NetworkPkg/DnsDxe/DnsDxe.inf\r