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]

1 files changed, 26 insertions, 45 deletions

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index ff5b910fd4..733a4c9d8a 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -29,15 +29,22 @@
   # -D FLAG=VALUE

   #

   DEFINE SECURE_BOOT_ENABLE      = FALSE

-  DEFINE NETWORK_IP6_ENABLE      = FALSE

-  DEFINE HTTP_BOOT_ENABLE        = FALSE

   DEFINE SMM_REQUIRE             = FALSE

-  DEFINE TLS_ENABLE              = FALSE

   DEFINE TPM2_ENABLE             = FALSE

   DEFINE TPM2_CONFIG_ENABLE      = FALSE

   DEFINE USE_LEGACY_ISA_STACK    = FALSE

 

   #

+  # Network definition

+  #

+  DEFINE NETWORK_TLS_ENABLE             = FALSE

+  DEFINE NETWORK_IP6_ENABLE             = FALSE

+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE

+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE

+

+!include NetworkPkg/NetworkDefines.dsc.inc

+

+  #

   # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to

   # one of the supported values, in place of any of the convenience macros, is

   # permitted.

@@ -144,10 +151,6 @@
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf

-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

   SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf

   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf

@@ -173,7 +176,7 @@
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf

 

   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

-!if $(TLS_ENABLE) == TRUE

+!if $(NETWORK_TLS_ENABLE) == TRUE

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

 !else

   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf

@@ -189,13 +192,13 @@
 !endif

   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf

 

-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

 

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

-!endif

+  #

+  # Network libraries

+  #

+!include NetworkPkg/NetworkLibs.dsc.inc

 

-!if $(TLS_ENABLE) == TRUE

+!if $(NETWORK_TLS_ENABLE) == TRUE

   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

 !endif

 

@@ -439,7 +442,7 @@
 !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800

-!if $(TLS_ENABLE) == FALSE

+!if $(NETWORK_TLS_ENABLE) == FALSE

   # match PcdFlashNvStorageVariableSize purely for convenience

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000

 !endif

@@ -447,12 +450,12 @@
 !if $(FD_SIZE_IN_KB) == 4096

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400

-!if $(TLS_ENABLE) == FALSE

+!if $(NETWORK_TLS_ENABLE) == FALSE

   # match PcdFlashNvStorageVariableSize purely for convenience

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000

 !endif

 !endif

-!if $(TLS_ENABLE) == TRUE

+!if $(NETWORK_TLS_ENABLE) == TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000

 !endif

@@ -501,9 +504,10 @@
   gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2

 !endif

 

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE

-!endif

+  #

+  # Network Pcds

+  #

+!include NetworkPkg/NetworkPcds.dsc.inc

 

   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }

 

@@ -784,32 +788,9 @@
   #

   # Network Support

   #

-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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

-  NetworkPkg/IScsiDxe/IScsiDxe.inf

-!if $(NETWORK_IP6_ENABLE) == TRUE

-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

-!endif

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  NetworkPkg/DnsDxe/DnsDxe.inf

-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

-  NetworkPkg/HttpDxe/HttpDxe.inf

-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf

-!endif

-!if $(TLS_ENABLE) == TRUE

-  NetworkPkg/TlsDxe/TlsDxe.inf

+!include NetworkPkg/NetworkComponents.dsc.inc

+

+!if $(NETWORK_TLS_ENABLE) == TRUE

   NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {

     <LibraryClasses>

       NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf