Nt32Pkg: Replace obsoleted network drivers from NT32 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: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 58d9f8787dde7aeb96dd896bec5bc80a925a025d..4293ca39fdec9590b12ff98b8a350053e4660c3b 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -4,7 +4,7 @@
 # The Emulation Platform can be used to debug individual modules, prior to creating\r
 #    a real platform. This also provides an example for how an DSC is created.\r
 #\r
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
@@ -468,20 +468,16 @@
   MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 \r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
   NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
   NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
   NetworkPkg/Udp6Dxe/Udp6Dxe.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
 \r
   NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index db2719fd99df478771feb3d079771a99764e237e..65d9bf812b5b68050a94256e82abb468e4cd6c19 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 # This is NT32 FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #    This program and the accompanying materials\r
@@ -257,19 +257,15 @@ INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
 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/TcpDxe/TcpDxe.inf\r
+INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
 INF  Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 !if $(NETWORK_IP6_ENABLE) == TRUE\r
 INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
 INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
 INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
 INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-INF  NetworkPkg/TcpDxe/TcpDxe.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
 INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
 INF  NetworkPkg/DnsDxe/DnsDxe.inf\r