]> git.proxmox.com Git - mirror_edk2.git/commitdiff
projects / mirror_edk2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5ae3184)
Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF.
authorFu Siyuan <siyuan.fu@intel.com>
Tue, 30 Oct 2018 06:51:16 +0000 (14:51 +0800)
committerFu Siyuan <siyuan.fu@intel.com>
Tue, 6 Nov 2018 01:06:12 +0000 (09:06 +0800)
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>
Vlv2TbltDevicePkg/PlatformPkg.fdf patch | blob | blame | history
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf patch | blob | blame | history
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc patch | blob | blame | history
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc patch | blob | blame | history
Vlv2TbltDevicePkg/PlatformPkgX64.dsc patch | blob | blame | history

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584deebeaee3fcefa0e05e56c89a616e56b..241314bed4e9abd7c987f2023c6f05981a314ddb 100644 (file)
--- 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\r
   INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !if $(NETWORK_IP6_ENABLE) == TRUE\r
   INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
   INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
@@ -751,22 +754,11 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
   !endif\r
-  !if $(NETWORK_IP6_ENABLE) == TRUE\r
-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  !else\r
-  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  !endif\r
   !if $(NETWORK_VLAN_ENABLE) == TRUE\r
   INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   !endif\r
   !if $(NETWORK_ISCSI_ENABLE) == TRUE\r
-  !if $(NETWORK_IP6_ENABLE) == TRUE\r
     INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-  !else\r
-    INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-  !endif\r
   !endif\r
 !endif\r
 \r
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f88b5f8e34b41d80f9ad4884d71dc5f..3566492772897479211f44fc533b3ea14edc328e 100644 (file)
--- 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\r
   INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !if $(NETWORK_IP6_ENABLE) == TRUE\r
   INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
   INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
@@ -707,22 +710,11 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
   INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
   !endif\r
-  !if $(NETWORK_IP6_ENABLE) == TRUE\r
-  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  !else\r
-  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  !endif\r
   !if $(NETWORK_VLAN_ENABLE) == TRUE\r
   INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   !endif\r
   !if $(NETWORK_ISCSI_ENABLE) == TRUE\r
-  !if $(NETWORK_IP6_ENABLE) == TRUE\r
     INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-  !else\r
-    INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-  !endif\r
   !endif\r
 !endif\r
 \r
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee908730ff68eca92c0b16b2843518359..f0a689c2c428577888c526bad62fe56d8737dc26 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.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
@@ -1528,11 +1528,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
@@ -1554,24 +1550,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
+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+    NetworkPkg/TcpDxe/TcpDxe.inf\r
     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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
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
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa63491679a3599c74ccbf7c3ea4c55b0e51e..cc8ad9508e9f4f284eb5285126c6f2c6c2288efd 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.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
@@ -1528,11 +1528,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
@@ -1554,24 +1550,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
+    NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+    NetworkPkg/TcpDxe/TcpDxe.inf\r
     MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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
EFI Development Kit II mirror for PVE