Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformPkgIA32.dsc

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565a310bc69bf94e367e42dbb0bc38d9a..c7908818b4de93c09280de070b271eaef560efcd 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -285,7 +285,7 @@
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
-!if $(FTPM_ENABLE) == TRUE\r
+!if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
@@ -1516,11 +1516,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 \r
 !if $(NETWORK_ENABLE) == TRUE\r
   !if $(NETWORK_ISCSI_ENABLE) == TRUE\r
-    !if $(NETWORK_IP6_ENABLE) == TRUE\r
-      NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-    !else\r
-      MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-    !endif\r
+    NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !endif\r
   !if $(NETWORK_VLAN_ENABLE) == TRUE\r
     MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
@@ -1542,24 +1538,16 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
     MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
     MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-    MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf {\r
-      <PcdsPatchableInModule>\r
-      gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000\r
-    }\r
     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+    NetworkPkg/TcpDxe/TcpDxe.inf\r
     !if $(NETWORK_IP6_ENABLE) == TRUE\r
       NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
       NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
       NetworkPkg/IpSecDxe/IpSecDxe.inf\r
-      NetworkPkg/TcpDxe/TcpDxe.inf\r
       NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
       NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
     !endif\r
-    !if $(NETWORK_IP6_ENABLE) == TRUE\r
-      NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-    !else\r
-      MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-    !endif\r
 !endif\r
 \r
 !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE)\r