ArmVirtPkg: 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:Add check for NETWORK_SNP_ENABLE and NETWORK_TLS_ENABLE.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Message-Id: <20190516081810.27840-4-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]
[lersek@redhat.com: undo spurious whitespace changes]
[lersek@redhat.com: clarify SNP and TLS rejection messages]
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

4 files changed, 52 insertions, 87 deletions

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 1848d20531..20bf011617 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -70,14 +70,8 @@
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf

 

   # Networking Requirements

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

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

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

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

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

-!if $(HTTP_BOOT_ENABLE) == TRUE

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

-!endif

+!include NetworkPkg/NetworkLibs.dsc.inc

+

 

   #

   # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 28c8fd5513..cf28478977 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -29,8 +29,25 @@
   #

   DEFINE TTY_TERMINAL            = FALSE

   DEFINE SECURE_BOOT_ENABLE      = FALSE

-  DEFINE NETWORK_IP6_ENABLE      = FALSE

-  DEFINE HTTP_BOOT_ENABLE        = FALSE

+

+  #

+  # Network definition

+  #

+  DEFINE NETWORK_IP6_ENABLE              = FALSE

+  DEFINE NETWORK_HTTP_BOOT_ENABLE        = FALSE

+  DEFINE NETWORK_SNP_ENABLE              = FALSE

+  DEFINE NETWORK_TLS_ENABLE              = FALSE

+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE

+

+!if $(NETWORK_SNP_ENABLE) == TRUE

+  !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"

+!endif

+

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  !error "NETWORK_TLS_ENABLE is tracked at <https://bugzilla.tianocore.org/show_bug.cgi?id=1009>"

+!endif

+

+!include NetworkPkg/NetworkDefines.dsc.inc

 

 !include ArmVirtPkg/ArmVirt.dsc.inc

 

@@ -122,9 +139,10 @@
   #

   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0

 

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE

-!endif

+  #

+  # Network Pcds

+  #

+!include NetworkPkg/NetworkPcds.dsc.inc

 

   # System Memory Base -- fixed at 0x4000_0000

   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000

@@ -353,29 +371,7 @@
   #

   # Networking stack

   #

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

-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

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

-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-  NetworkPkg/TcpDxe/TcpDxe.inf

-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.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

+!include NetworkPkg/NetworkComponents.dsc.inc

 

   #

   # SCSI Bus and Disk Driver

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index a9a980aefc..31f615a9d0 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -117,29 +117,8 @@ READ_LOCK_STATUS   = TRUE
   #

   # Networking stack

   #

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

-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

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

-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-  INF NetworkPkg/TcpDxe/TcpDxe.inf

-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf

-!if $(NETWORK_IP6_ENABLE) == TRUE

-  INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf

-  INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf

-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

-!endif

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  INF NetworkPkg/DnsDxe/DnsDxe.inf

-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

-  INF NetworkPkg/HttpDxe/HttpDxe.inf

-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf

-!endif

+!include NetworkPkg/Network.fdf.inc

+

 

   #

   # SCSI Bus and Disk Driver

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 2a83c74694..596e59739c 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -29,8 +29,25 @@
   #

   DEFINE TTY_TERMINAL            = FALSE

   DEFINE SECURE_BOOT_ENABLE      = FALSE

-  DEFINE NETWORK_IP6_ENABLE      = FALSE

-  DEFINE HTTP_BOOT_ENABLE        = FALSE

+

+  #

+  # Network definition

+  #

+  DEFINE NETWORK_IP6_ENABLE              = FALSE

+  DEFINE NETWORK_HTTP_BOOT_ENABLE        = FALSE

+  DEFINE NETWORK_SNP_ENABLE              = FALSE

+  DEFINE NETWORK_TLS_ENABLE              = FALSE

+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE

+

+!if $(NETWORK_SNP_ENABLE) == TRUE

+  !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"

+!endif

+

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  !error "NETWORK_TLS_ENABLE is tracked at <https://bugzilla.tianocore.org/show_bug.cgi?id=1009>"

+!endif

+

+!include NetworkPkg/NetworkDefines.dsc.inc

 

 !include ArmVirtPkg/ArmVirt.dsc.inc

 

@@ -127,9 +144,10 @@
   #

   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0

 

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE

-!endif

+  #

+  # Network Pcds

+  #

+!include NetworkPkg/NetworkPcds.dsc.inc

 

   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

@@ -337,29 +355,7 @@
   #

   # Networking stack

   #

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

-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

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

-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-  NetworkPkg/TcpDxe/TcpDxe.inf

-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.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

+!include NetworkPkg/NetworkComponents.dsc.inc

 

   #

   # SCSI Bus and Disk Driver