]> git.proxmox.com Git - mirror_edk2.git/commitdiff
projects / mirror_edk2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: bc01f49)
ArmVirtPkg: Update DSC/FDF to use NetworkPkg's include fragment file.
authorFu Siyuan <siyuan.fu@intel.com>
Thu, 16 May 2019 08:18:09 +0000 (16:18 +0800)
committerLaszlo Ersek <lersek@redhat.com>
Thu, 16 May 2019 14:45:37 +0000 (16:45 +0200)
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>
ArmVirtPkg/ArmVirt.dsc.inc patch | blob | blame | history
ArmVirtPkg/ArmVirtQemu.dsc patch | blob | blame | history
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc patch | blob | blame | history
ArmVirtPkg/ArmVirtQemuKernel.dsc patch | blob | blame | history

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 1848d20531ab5d49c3c8b770fdf9591d5466a0c1..20bf011617a121fbc405f3371ffdecc17c564ea1 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -70,14 +70,8 @@
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf\r
 \r
   # Networking Requirements\r
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
-!endif\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
+\r
 \r
   #\r
   # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.\r
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 28c8fd5513443813a3f4bd719e3072145b816b32..cf28478977e1d2ef0bc0f269734e22d55afecee0 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -29,8 +29,25 @@
   #\r
   DEFINE TTY_TERMINAL            = FALSE\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE NETWORK_IP6_ENABLE      = FALSE\r
-  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
+\r
+  #\r
+  # Network definition\r
+  #\r
+  DEFINE NETWORK_IP6_ENABLE              = FALSE\r
+  DEFINE NETWORK_HTTP_BOOT_ENABLE        = FALSE\r
+  DEFINE NETWORK_SNP_ENABLE              = FALSE\r
+  DEFINE NETWORK_TLS_ENABLE              = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE\r
+\r
+!if $(NETWORK_SNP_ENABLE) == TRUE\r
+  !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"\r
+!endif\r
+\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+  !error "NETWORK_TLS_ENABLE is tracked at <https://bugzilla.tianocore.org/show_bug.cgi?id=1009>"\r
+!endif\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
@@ -122,9 +139,10 @@
   #\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\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
   # System Memory Base -- fixed at 0x4000_0000\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000\r
@@ -353,29 +371,7 @@
   #\r
   # Networking stack\r
   #\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.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/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.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
+!include NetworkPkg/NetworkComponents.dsc.inc\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index a9a980aefc3e6f0a8a5589df9000acb1b9e445b3..31f615a9d0f9ae98a11ba4868143cd9c0adec6d4 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -117,29 +117,8 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # Networking stack\r
   #\r
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.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/MnpDxe/MnpDxe.inf\r
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  INF NetworkPkg/TcpDxe/TcpDxe.inf\r
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.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
+!include NetworkPkg/Network.fdf.inc\r
+\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 2a83c7469424ee17e1eebc70105a0df9c9760f14..596e59739cabc29412276ecfd5463b6c85320ae9 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -29,8 +29,25 @@
   #\r
   DEFINE TTY_TERMINAL            = FALSE\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE NETWORK_IP6_ENABLE      = FALSE\r
-  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
+\r
+  #\r
+  # Network definition\r
+  #\r
+  DEFINE NETWORK_IP6_ENABLE              = FALSE\r
+  DEFINE NETWORK_HTTP_BOOT_ENABLE        = FALSE\r
+  DEFINE NETWORK_SNP_ENABLE              = FALSE\r
+  DEFINE NETWORK_TLS_ENABLE              = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS  = TRUE\r
+\r
+!if $(NETWORK_SNP_ENABLE) == TRUE\r
+  !error "NETWORK_SNP_ENABLE is IA32/X64/EBC only"\r
+!endif\r
+\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+  !error "NETWORK_TLS_ENABLE is tracked at <https://bugzilla.tianocore.org/show_bug.cgi?id=1009>"\r
+!endif\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
@@ -127,9 +144,10 @@
   #\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\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
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }\r
@@ -337,29 +355,7 @@
   #\r
   # Networking stack\r
   #\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.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/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.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
+!include NetworkPkg/NetworkComponents.dsc.inc\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r
EFI Development Kit II mirror for PVE