From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F1E1E2117FD77 for ; Tue, 30 Oct 2018 00:33:44 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2018 00:33:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,443,1534834800"; d="scan'208";a="103699034" Received: from shwdeopenpsi787.ccr.corp.intel.com ([10.239.158.24]) by fmsmga001.fm.intel.com with ESMTP; 30 Oct 2018 00:33:44 -0700 From: Fu Siyuan To: edk2-devel@lists.01.org Cc: David Wei , Mang Guo Date: Tue, 30 Oct 2018 15:33:25 +0800 Message-Id: <20181030073328.62924-5-siyuan.fu@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20181030073328.62924-1-siyuan.fu@intel.com> References: <20181030073328.62924-1-siyuan.fu@intel.com> Subject: [PATCH v1 4/7] Vlv2TbltDevicePkg: Replace obsoleted drivers from platform DSC/FDF. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2018 07:33:45 -0000 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 Cc: Mang Guo Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 14 +++----------- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 14 +++----------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 18 +++--------------- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 18 +++--------------- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 18 +++--------------- 5 files changed, 15 insertions(+), 67 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index b7a0e584deeb..241314bed4e9 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -744,6 +744,9 @@ [FV.FVMAIN] 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 @@ [FV.FVMAIN] 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 eca273e33f88..356649277289 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -700,6 +700,9 @@ [FV.FVMAIN] 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 @@ [FV.FVMAIN] 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 3e3522aee908..322793257e0b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1528,11 +1528,7 @@ [Components.X64] !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 @@ [Components.X64] MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf { - - 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 55c873d565a3..a0f31d824e4c 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1516,11 +1516,7 @@ [Components.IA32] !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 @@ [Components.IA32] MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf { - - 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 fa6aa6349167..54c3bd9b570e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1528,11 +1528,7 @@ [Components.X64] !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 @@ [Components.X64] MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf { - - 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) -- 2.18.0.windows.1