Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.

V2:
Add missed library instance for NetworkPkg iSCSI driver.

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: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>

5 files changed, 18 insertions, 70 deletions

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584de..241314bed4 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -744,6 +744,9 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.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/Dhcp6Dxe/Dhcp6Dxe.inf

@@ -751,22 +754,11 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

   INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

   !endif

-  !if $(NETWORK_IP6_ENABLE) == TRUE

-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF  NetworkPkg/TcpDxe/TcpDxe.inf

-  !else

-  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

-  !endif

   !if $(NETWORK_VLAN_ENABLE) == TRUE

   INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

   !endif

   !if $(NETWORK_ISCSI_ENABLE) == TRUE

-  !if $(NETWORK_IP6_ENABLE) == TRUE

     INF  NetworkPkg/IScsiDxe/IScsiDxe.inf

-  !else

-    INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

-  !endif

   !endif

 !endif

 

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f..3566492772 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -700,6 +700,9 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.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/Dhcp6Dxe/Dhcp6Dxe.inf

@@ -707,22 +710,11 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

   INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

   !endif

-  !if $(NETWORK_IP6_ENABLE) == TRUE

-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF  NetworkPkg/TcpDxe/TcpDxe.inf

-  !else

-  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

-  !endif

   !if $(NETWORK_VLAN_ENABLE) == TRUE

   INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

   !endif

   !if $(NETWORK_ISCSI_ENABLE) == TRUE

-  !if $(NETWORK_IP6_ENABLE) == TRUE

     INF  NetworkPkg/IScsiDxe/IScsiDxe.inf

-  !else

-    INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

-  !endif

   !endif

 !endif

 

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee9..f0a689c2c4 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -285,7 +285,7 @@
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(FTPM_ENABLE) == TRUE

+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

@@ -1528,11 +1528,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 

 !if $(NETWORK_ENABLE) == TRUE

   !if $(NETWORK_ISCSI_ENABLE) == TRUE

-    !if $(NETWORK_IP6_ENABLE) == TRUE

-      NetworkPkg/IScsiDxe/IScsiDxe.inf

-    !else

-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

-    !endif

+    NetworkPkg/IScsiDxe/IScsiDxe.inf

   !endif

   !if $(NETWORK_VLAN_ENABLE) == TRUE

     MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

@@ -1554,24 +1550,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

     MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

     MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {

-      <PcdsPatchableInModule>

-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000

-    }

+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+    NetworkPkg/TcpDxe/TcpDxe.inf

     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

     !if $(NETWORK_IP6_ENABLE) == TRUE

       NetworkPkg/Ip6Dxe/Ip6Dxe.inf

       NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

       NetworkPkg/IpSecDxe/IpSecDxe.inf

-      NetworkPkg/TcpDxe/TcpDxe.inf

       NetworkPkg/Udp6Dxe/Udp6Dxe.inf

       NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

     !endif

-    !if $(NETWORK_IP6_ENABLE) == TRUE

-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-    !else

-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-    !endif

 !endif

 

 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565..c7908818b4 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -285,7 +285,7 @@
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(FTPM_ENABLE) == TRUE

+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

@@ -1516,11 +1516,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 

 !if $(NETWORK_ENABLE) == TRUE

   !if $(NETWORK_ISCSI_ENABLE) == TRUE

-    !if $(NETWORK_IP6_ENABLE) == TRUE

-      NetworkPkg/IScsiDxe/IScsiDxe.inf

-    !else

-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

-    !endif

+    NetworkPkg/IScsiDxe/IScsiDxe.inf

   !endif

   !if $(NETWORK_VLAN_ENABLE) == TRUE

     MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

@@ -1542,24 +1538,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

     MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

     MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {

-      <PcdsPatchableInModule>

-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000

-    }

     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+    NetworkPkg/TcpDxe/TcpDxe.inf

     !if $(NETWORK_IP6_ENABLE) == TRUE

       NetworkPkg/Ip6Dxe/Ip6Dxe.inf

       NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

       NetworkPkg/IpSecDxe/IpSecDxe.inf

-      NetworkPkg/TcpDxe/TcpDxe.inf

       NetworkPkg/Udp6Dxe/Udp6Dxe.inf

       NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

     !endif

-    !if $(NETWORK_IP6_ENABLE) == TRUE

-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-    !else

-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-    !endif

 !endif

 

 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa63491..cc8ad9508e 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -285,7 +285,7 @@
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-!if $(FTPM_ENABLE) == TRUE

+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

@@ -1528,11 +1528,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 

 !if $(NETWORK_ENABLE) == TRUE

   !if $(NETWORK_ISCSI_ENABLE) == TRUE

-    !if $(NETWORK_IP6_ENABLE) == TRUE

-      NetworkPkg/IScsiDxe/IScsiDxe.inf

-    !else

-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

-    !endif

+    NetworkPkg/IScsiDxe/IScsiDxe.inf

   !endif

   !if $(NETWORK_VLAN_ENABLE) == TRUE

     MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

@@ -1554,24 +1550,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

     MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

     MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {

-      <PcdsPatchableInModule>

-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000

-    }

+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

+    NetworkPkg/TcpDxe/TcpDxe.inf

     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

     !if $(NETWORK_IP6_ENABLE) == TRUE

       NetworkPkg/Ip6Dxe/Ip6Dxe.inf

       NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

       NetworkPkg/IpSecDxe/IpSecDxe.inf

-      NetworkPkg/TcpDxe/TcpDxe.inf

       NetworkPkg/Udp6Dxe/Udp6Dxe.inf

       NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

     !endif

-    !if $(NETWORK_IP6_ENABLE) == TRUE

-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-    !else

-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-    !endif

 !endif

 

 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)