ArmVirtPkg/ArmVirtQemu: port HTTP_BOOT_ENABLE from OvmfPkg

* From commit ab44a6e833fa ("OvmfPkg: Add HttpBoot support", 2015-08-23):
  - introduce HTTP_BOOT_ENABLE build define
  - resolve HttpLib class
  - include NetworkPkg drivers DnsDxe, HttpDxe, HttpBootDxe

* From commit 1a85139d9eac ("OvmfPkg: Build HTTP utilities driver",
  2015-08-28):
  - include NetworkPkg driver HttpUtilitiesDxe

* From commit 4b2fb7986d57 ("OvmfPkg: Allow HTTP connections if HTTP Boot
  enabled", 2017-01-19):
  - set PcdAllowHttpConnections to TRUE

> ## Indicates whether HTTP connections (i.e., unsecured) are permitted or
> ## not.
> # TRUE  - HTTP connections are allowed. Both the "https://" and
> #         "http://" URI schemes are permitted.
> # FALSE - HTTP connections are denied. Only the "https://" URI scheme is
> #         permitted.
> # @Prompt Indicates whether HTTP connections are permitted or not.
> gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|FALSE|BOOLEAN|...

TLS_ENABLE (for HTTPS) is not ported for the time being.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 57baf597398a937849bfd965940872b8460a7196..9ec70fb8b13499ba76aaa339e238c8cf98bd3812 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -34,6 +34,7 @@
   # -D FLAG=VALUE\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
+  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
@@ -63,6 +64,10 @@
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
 \r
+!if $(HTTP_BOOT_ENABLE) == TRUE\r
+  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
+!endif\r
+\r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 \r
@@ -124,6 +129,10 @@
   #\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\r
 \r
+!if $(HTTP_BOOT_ENABLE) == TRUE\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
+!endif\r
+\r
   # System Memory Base -- fixed at 0x4000_0000\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000\r
 \r
@@ -338,6 +347,12 @@
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\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
 \r
   #\r
   # SCSI Bus and Disk Driver\r

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index e54eeea41ee66ab179b38496afdfdd90f5cd1515..f0f4be2fa048b623b8e29baa3142a352e632845f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -128,6 +128,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\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
 \r
   #\r
   # SCSI Bus and Disk Driver\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 8c15da3490ab5261dd3709a4d1284efa2ad5367c..33c1385c851043a9b76a06a5cf755eab2254d185 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -34,6 +34,7 @@
   # -D FLAG=VALUE\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
+  DEFINE HTTP_BOOT_ENABLE        = FALSE\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
@@ -63,6 +64,10 @@
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
 \r
+!if $(HTTP_BOOT_ENABLE) == TRUE\r
+  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
+!endif\r
+\r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 \r
@@ -129,6 +134,10 @@
   #\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\r
 \r
+!if $(HTTP_BOOT_ENABLE) == TRUE\r
+  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
+!endif\r
+\r
 [PcdsPatchableInModule.common]\r
   #\r
   # This will be overridden in the code\r
@@ -329,6 +338,12 @@
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\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
 \r
   #\r
   # SCSI Bus and Disk Driver\r