From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: liming.gao@intel.com) Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:51 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:51 -0700 X-ExtLoop1: 1 Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:50 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Zailiang Sun , Yi Qian Subject: [Patch edk2-platform V4 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF. Date: Tue, 21 May 2019 21:36:20 +0800 Message-Id: <20190521133623.20404-16-liming.gao@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@intel.com> From: Shenglei Zhang This patch updates the platform DSC/FDF files to use the include fragment files provided by NetworkPkg. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Shenglei Zhang Reviewed-by: Zailiang Sun --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 24 ++---------------------- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 6 ++++++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 24 ++---------------------- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 +++++++------------------------------------ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 +++++---------------------------------- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 42 ++++++------------------------------------ 6 files changed, 28 insertions(+), 150 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf index 098602b9d8..5827386977 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -714,33 +714,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA { # # Network Modules # +!include NetworkPkg/Network.fdf.inc + !if $(NETWORK_ENABLE) == TRUE FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C { SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi SECTION UI = "UNDI" } - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - 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 - !if $(NETWORK_IP6_ENABLE) == TRUE - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - !endif - !if $(NETWORK_VLAN_ENABLE) == TRUE - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - !endif - !if $(NETWORK_ISCSI_ENABLE) == TRUE - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - !endif !endif !if $(CAPSULE_ENABLE) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index 6d556c1be2..61eca30be1 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -76,10 +76,16 @@ DEFINE ENBDT_S3_SUPPORT = TRUE DEFINE LZMA_ENABLE = TRUE DEFINE S4_ENABLE = TRUE + +# +# Network definition +# DEFINE NETWORK_ENABLE = TRUE DEFINE NETWORK_IP6_ENABLE = TRUE DEFINE NETWORK_ISCSI_ENABLE = FALSE DEFINE NETWORK_VLAN_ENABLE = FALSE +DEFINE NETWORK_TLS_ENABLE = FALSE +DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE DEFINE SATA_ENABLE = TRUE DEFINE PCIESC_ENABLE = TRUE diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 1ba6124a69..a6859d3b6d 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -670,33 +670,13 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA { # # Network Modules # +!include NetworkPkg/Network.fdf.inc + !if $(NETWORK_ENABLE) == TRUE FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C { SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi SECTION UI = "UNDI" } - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - 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 - !if $(NETWORK_IP6_ENABLE) == TRUE - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - !endif - !if $(NETWORK_VLAN_ENABLE) == TRUE - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - !endif - !if $(NETWORK_ISCSI_ENABLE) == TRUE - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - !endif !endif !if $(CAPSULE_ENABLE) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 3a3d3e29e7..b9c4739e09 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -50,6 +50,8 @@ !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + DEFINE PLATFORMX64_ENABLE = TRUE + !if $(X64_CONFIG) == TRUE DEFINE DXE_ARCHITECTURE = X64 DEFINE EDK_DXE_ARCHITECTURE = X64 @@ -167,13 +169,7 @@ !if $(SCSI_ENABLE) == TRUE UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf !endif -!if $(NETWORK_ENABLE) == TRUE - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf -!endif + !if $(S3_ENABLE) == TRUE S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf !endif @@ -1451,42 +1447,17 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf } + # + # Network Stacks + # +!include NetworkPkg/Network.dsc.inc !if $(NETWORK_ENABLE) == TRUE - !if $(NETWORK_ISCSI_ENABLE) == TRUE - NetworkPkg/IScsiDxe/IScsiDxe.inf - !endif - !if $(NETWORK_VLAN_ENABLE) == TRUE - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - !endif !if $(CSM_ENABLE) == TRUE IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf !endif !endif -!if $(NETWORK_ENABLE) == TRUE - # - # UEFI network modules - # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - 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/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - !endif -!endif - !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 69286bfc6f..c0ae9c02af 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -167,13 +167,7 @@ !if $(SCSI_ENABLE) == TRUE UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf !endif -!if $(NETWORK_ENABLE) == TRUE - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf -!endif + !if $(S3_ENABLE) == TRUE S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf !endif @@ -1438,40 +1432,17 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf } + # + # Network Stacks + # +!include NetworkPkg/Network.dsc.inc !if $(NETWORK_ENABLE) == TRUE - !if $(NETWORK_ISCSI_ENABLE) == TRUE - NetworkPkg/IScsiDxe/IScsiDxe.inf - !endif - !if $(NETWORK_VLAN_ENABLE) == TRUE - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - !endif !if $(CSM_ENABLE) == TRUE IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf !endif !endif -!if $(NETWORK_ENABLE) == TRUE - # - # UEFI network modules - # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - 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/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - !endif !endif !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 4a226cf03c..0cb1bb9a9c 100644 --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -50,6 +50,8 @@ !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + DEFINE PLATFORMX64_ENABLE = TRUE + !if $(X64_CONFIG) == TRUE DEFINE DXE_ARCHITECTURE = X64 DEFINE EDK_DXE_ARCHITECTURE = X64 @@ -167,13 +169,6 @@ !if $(SCSI_ENABLE) == TRUE UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf !endif -!if $(NETWORK_ENABLE) == TRUE - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf -!endif !if $(S3_ENABLE) == TRUE S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf !endif @@ -1453,42 +1448,17 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf } + # + # Network Stacks + # +!include NetworkPkg/Network.dsc.inc !if $(NETWORK_ENABLE) == TRUE - !if $(NETWORK_ISCSI_ENABLE) == TRUE - NetworkPkg/IScsiDxe/IScsiDxe.inf - !endif - !if $(NETWORK_VLAN_ENABLE) == TRUE - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - !endif !if $(CSM_ENABLE) == TRUE IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf !endif !endif -!if $(NETWORK_ENABLE) == TRUE - # - # UEFI network modules - # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - 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/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - !endif -!endif - !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf -- 2.13.0.windows.1