OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file.

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.

v2:1.Make the comments before Network definition align other parts.
   2.Set NETWORK_ALLOW_HTTP_CONNECTIONS true.
   3.Remove TcpIoLib in lib classes section.
   4.Withdraw the removal of [PcdsFixedAtBuild.X64].

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Message-Id: <20190516081810.27840-2-shenglei.zhang@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1293
[lersek@redhat.com: add TianoCore Bugzilla reference]

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 64054e226f88ca8dd1643d65b9a92f3bdd39d95e..578fc6c98ec8537b4ea018edf2127a1cbb833b55 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -29,14 +29,21 @@
   # -D FLAG=VALUE\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE NETWORK_IP6_ENABLE      = FALSE\r
-  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SMM_REQUIRE             = FALSE\r
-  DEFINE TLS_ENABLE              = FALSE\r
   DEFINE TPM2_ENABLE             = FALSE\r
   DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
   DEFINE USE_LEGACY_ISA_STACK    = FALSE\r
 \r
+  #\r
+  # Network definition\r
+  #\r
+  DEFINE NETWORK_TLS_ENABLE             = FALSE\r
+  DEFINE NETWORK_IP6_ENABLE             = FALSE\r
+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
+\r
   #\r
   # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to\r
   # one of the supported values, in place of any of the convenience macros, is\r
@@ -139,10 +146,6 @@
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
@@ -168,7 +171,7 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
 \r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 !else\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
@@ -184,13 +187,13 @@
 !endif\r
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
 \r
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
 \r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
-!endif\r
+  #\r
+  # Network libraries\r
+  #\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
 \r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
 !endif\r
 \r
@@ -434,7 +437,7 @@
 !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
   # match PcdFlashNvStorageVariableSize purely for convenience\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000\r
 !endif\r
@@ -442,12 +445,12 @@
 !if $(FD_SIZE_IN_KB) == 4096\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
   # match PcdFlashNvStorageVariableSize purely for convenience\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000\r
 !endif\r
 !endif\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
 !endif\r
@@ -496,9 +499,10 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
 !endif\r
 \r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
+  #\r
+  # Network Pcds\r
+  #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
 \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
 \r
@@ -777,32 +781,9 @@
   #\r
   # Network Support\r
   #\r
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
-  NetworkPkg/TlsDxe/TlsDxe.inf\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
     <LibraryClasses>\r
       NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index bc08bf2243932a36afe1a62acf3af428083f6743..e428334702b812040b8ecded1699e28faf3462d6 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -297,34 +297,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
 #\r
 # Network modules\r
 #\r
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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/Udp6Dxe/Udp6Dxe.inf\r
-  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
-  INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
-  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
-!endif\r
+!include NetworkPkg/Network.fdf.inc\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index ca7c5aaeb7c0ca5f58fdd8ed8930387164474e50..eade8f62d3de0e99939756a19ac6653354f8ce92 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -29,14 +29,21 @@
   # -D FLAG=VALUE\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE NETWORK_IP6_ENABLE      = FALSE\r
-  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SMM_REQUIRE             = FALSE\r
-  DEFINE TLS_ENABLE              = FALSE\r
   DEFINE TPM2_ENABLE             = FALSE\r
   DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
   DEFINE USE_LEGACY_ISA_STACK    = FALSE\r
 \r
+  #\r
+  # Network definition\r
+  #\r
+  DEFINE NETWORK_TLS_ENABLE             = FALSE\r
+  DEFINE NETWORK_IP6_ENABLE             = FALSE\r
+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
+\r
   #\r
   # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to\r
   # one of the supported values, in place of any of the convenience macros, is\r
@@ -144,10 +151,6 @@
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
@@ -173,7 +176,7 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
 \r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 !else\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
@@ -189,13 +192,13 @@
 !endif\r
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
 \r
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
 \r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
-!endif\r
+  #\r
+  # Network libraries\r
+  #\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
 \r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
 !endif\r
 \r
@@ -439,7 +442,7 @@
 !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
   # match PcdFlashNvStorageVariableSize purely for convenience\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000\r
 !endif\r
@@ -447,12 +450,12 @@
 !if $(FD_SIZE_IN_KB) == 4096\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
   # match PcdFlashNvStorageVariableSize purely for convenience\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000\r
 !endif\r
 !endif\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
 !endif\r
@@ -502,9 +505,10 @@
 !endif\r
 \r
 [PcdsFixedAtBuild.X64]\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
+  #\r
+  # Network Pcds\r
+  #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
 \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
 \r
@@ -786,32 +790,9 @@
   #\r
   # Network Support\r
   #\r
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
-  NetworkPkg/TlsDxe/TlsDxe.inf\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
     <LibraryClasses>\r
       NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index ccf36c5dd95401487331ce24a88e839d869fbdfe..6ddffe75475b9c9c11c2b9946188f9337535647b 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -303,34 +303,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
     SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
   }\r
 !endif\r
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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/Udp6Dxe/Udp6Dxe.inf\r
-  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
-  INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
-  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
-!endif\r
+!include NetworkPkg/Network.fdf.inc\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index ff5b910fd4c2be6626a6d530ca481e041cc7b3cf..733a4c9d8a431747d3eb29d16767fae4afbd121a 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -29,14 +29,21 @@
   # -D FLAG=VALUE\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE NETWORK_IP6_ENABLE      = FALSE\r
-  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SMM_REQUIRE             = FALSE\r
-  DEFINE TLS_ENABLE              = FALSE\r
   DEFINE TPM2_ENABLE             = FALSE\r
   DEFINE TPM2_CONFIG_ENABLE      = FALSE\r
   DEFINE USE_LEGACY_ISA_STACK    = FALSE\r
 \r
+  #\r
+  # Network definition\r
+  #\r
+  DEFINE NETWORK_TLS_ENABLE             = FALSE\r
+  DEFINE NETWORK_IP6_ENABLE             = FALSE\r
+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
+\r
   #\r
   # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to\r
   # one of the supported values, in place of any of the convenience macros, is\r
@@ -144,10 +151,6 @@
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
@@ -173,7 +176,7 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
 \r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 !else\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
@@ -189,13 +192,13 @@
 !endif\r
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
 \r
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
 \r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
-!endif\r
+  #\r
+  # Network libraries\r
+  #\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
 \r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
 !endif\r
 \r
@@ -439,7 +442,7 @@
 !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
   # match PcdFlashNvStorageVariableSize purely for convenience\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000\r
 !endif\r
@@ -447,12 +450,12 @@
 !if $(FD_SIZE_IN_KB) == 4096\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400\r
-!if $(TLS_ENABLE) == FALSE\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
   # match PcdFlashNvStorageVariableSize purely for convenience\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000\r
 !endif\r
 !endif\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
 !endif\r
@@ -501,9 +504,10 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
 !endif\r
 \r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
+  #\r
+  # Network Pcds\r
+  #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
 \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
 \r
@@ -784,32 +788,9 @@
   #\r
   # Network Support\r
   #\r
-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
-  NetworkPkg/TlsDxe/TlsDxe.inf\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
     <LibraryClasses>\r
       NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index ccf36c5dd95401487331ce24a88e839d869fbdfe..6ddffe75475b9c9c11c2b9946188f9337535647b 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -303,34 +303,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf
     SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
   }\r
 !endif\r
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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/Udp6Dxe/Udp6Dxe.inf\r
-  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
-  INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
-  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
-!endif\r
+!include NetworkPkg/Network.fdf.inc\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r