This patch updates the platform DSC/FDF files to use the include fragment files provided by NetworkPkg. The feature enabling flags in [Defines] section have been updated to use the NetworkPkg's terms, and the value has been overridden with the original default value on this platform.
Cc: David Wei <david....@intel.com> Cc: Mang Guo <mang....@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Fu Siyuan <siyuan...@intel.com> --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 25 +----------- Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 3 ++ Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 25 +----------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 42 +++----------------- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 42 +++----------------- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 42 +++----------------- 6 files changed, 20 insertions(+), 159 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index f976b9fa4057..e281d1407fc2 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -728,35 +728,12 @@ [FV.FVMAIN] # # Network Modules # +!include NetworkPkg/Network.fdf.inc !if $(NETWORK_ENABLE) == TRUE FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C { SECTION PE32 = Vlv2MiscBinariesPkg/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 - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - !if $(NETWORK_IP6_ENABLE) == TRUE - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - INF NetworkPkg/IpSecDxe/IpSecDxe.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/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc index 672853dda6a6..63a5b00b43bd 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc @@ -85,6 +85,9 @@ 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 NETWORK_ALLOW_HTTP_CONNECTIONS = FALSE DEFINE SATA_ENABLE = TRUE DEFINE PCIESC_ENABLE = TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 50032f7d5f19..6ea0ec92d4ae 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -684,35 +684,12 @@ [FV.FVMAIN] # # Network Modules # +!include NetworkPkg/Network.fdf.inc !if $(NETWORK_ENABLE) == TRUE FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C { SECTION PE32 = Vlv2MiscBinariesPkg/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 - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - !if $(NETWORK_IP6_ENABLE) == TRUE - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - INF NetworkPkg/IpSecDxe/IpSecDxe.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/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index f8ad29df5986..219ddd1646e5 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -56,6 +56,11 @@ [Defines] !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + # + # Network Stacks + # + !include NetworkPkg/Network.dsc.inc + !if $(X64_CONFIG) == TRUE DEFINE DXE_ARCHITECTURE = X64 DEFINE EDK_DXE_ARCHITECTURE = X64 @@ -173,13 +178,6 @@ [LibraryClasses.common] !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 @@ -1528,41 +1526,11 @@ [Components.X64] !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/IpSecDxe/IpSecDxe.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/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index ca3b2ff90287..715a51a2ec08 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -56,6 +56,11 @@ [Defines] !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + # + # Network Stacks + # + !include NetworkPkg/Network.dsc.inc + !if $(X64_CONFIG) == TRUE DEFINE DXE_ARCHITECTURE = X64 DEFINE EDK_DXE_ARCHITECTURE = X64 @@ -173,13 +178,6 @@ [LibraryClasses.common] !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 @@ -1516,41 +1514,11 @@ [Components.IA32] !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 - 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/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/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 81f36bd73b28..0393e2ace3aa 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -56,6 +56,11 @@ [Defines] !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc + # + # Network Stacks + # + !include NetworkPkg/Network.dsc.inc + !if $(X64_CONFIG) == TRUE DEFINE DXE_ARCHITECTURE = X64 DEFINE EDK_DXE_ARCHITECTURE = X64 @@ -173,13 +178,6 @@ [LibraryClasses.common] !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 @@ -1528,41 +1526,11 @@ [Components.X64] !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/IpSecDxe/IpSecDxe.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.19.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel