NetworkPkg: Add NETWORK_HTTP_ENABLE macro

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2917

Add NETWORK_HTTP_ENABLE macro and separate HttpDxe
and HttpUtilitiesDxe drivers from
HTTP_NETWORK_HTTP_BOOT_ENABLE macro.

Current NETWORK_HTTP_BOOT_ENABLE macro is defined to enable HTTP
boot feature in POST, this macro is not only enabling HTTP Boot
related modules but also enabling other generic HTTP modules
such as HttpDxe, HttpUtilitiesDxe and DnsDxe.
These HTTP base drivers would not be only used by HTTP boot
when we introduce the use case of Redfish implementation over
HTTP to edk2.
We should have a dedicate macro to enable generic HTTP functions
on Network stack and additionally provide NETWORK_HTTP_BOOT_ENABLE
for HTTP boot functionality for the use case that platform doesn't
require HTTP boot.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Nickle Wang <nickle.wang@hpe.com>
Cc: Peter O'Hanley <peter.ohanley@hpe.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/NetworkPkg/Network.fdf.inc b/NetworkPkg/Network.fdf.inc
index 803a0d64fd6070980c3cd8b4712b1fb6af2596d6..8a662ad1dee636c6af887bf6db71d06a13169fa0 100644 (file)
--- a/NetworkPkg/Network.fdf.inc
+++ b/NetworkPkg/Network.fdf.inc
@@ -46,10 +46,13 @@
     INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
   !endif\r
 \r
-  !if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE\r
+  !if ($(NETWORK_HTTP_BOOT_ENABLE) == TRUE) OR ($(NETWORK_HTTP_ENABLE) == TRUE)\r
     INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
     INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
     INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
+  !endif\r
+\r
+  !if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE\r
     INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
   !endif\r
 \r

diff --git a/NetworkPkg/NetworkComponents.dsc.inc b/NetworkPkg/NetworkComponents.dsc.inc
index 40cb8ee18e63f16faa507159224d5f6670f1f17c..21cb62082fc0c5e28fef12463c57b05a1e5e09d2 100644 (file)
--- a/NetworkPkg/NetworkComponents.dsc.inc
+++ b/NetworkPkg/NetworkComponents.dsc.inc
@@ -48,10 +48,13 @@
     NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
   !endif\r
 \r
-  !if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE\r
+  !if ($(NETWORK_HTTP_BOOT_ENABLE) == TRUE) OR ($(NETWORK_HTTP_ENABLE) == TRUE)\r
     NetworkPkg/DnsDxe/DnsDxe.inf\r
     NetworkPkg/HttpDxe/HttpDxe.inf\r
     NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
+  !endif\r
+\r
+  !if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE\r
     NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
   !endif\r
 \r

diff --git a/NetworkPkg/NetworkDefines.dsc.inc b/NetworkPkg/NetworkDefines.dsc.inc
index 18921d81f63b368951747234001db9f1e37e7943..54deb6342aaa89830292b65eedec067c07bf8343 100644 (file)
--- a/NetworkPkg/NetworkDefines.dsc.inc
+++ b/NetworkPkg/NetworkDefines.dsc.inc
@@ -15,12 +15,14 @@
 #   DEFINE NETWORK_IP4_ENABLE             = TRUE\r
 #   DEFINE NETWORK_IP6_ENABLE             = TRUE\r
 #   DEFINE NETWORK_TLS_ENABLE             = TRUE\r
+#   DEFINE NETWORK_HTTP_ENABLE            = FALSE\r
 #   DEFINE NETWORK_HTTP_BOOT_ENABLE       = TRUE\r
 #   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = FALSE\r
 #   DEFINE NETWORK_ISCSI_ENABLE           = FALSE\r
 #   DEFINE NETWORK_VLAN_ENABLE            = TRUE\r
 #\r
 # Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
 #    SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -73,10 +75,21 @@
   DEFINE NETWORK_TLS_ENABLE = TRUE\r
 !endif\r
 \r
+!ifndef NETWORK_HTTP_ENABLE\r
+  #\r
+  # This flag is to enable or disable HTTP(S) feature.\r
+  # The default is set to FALSE to not affecting the existing\r
+  # platforms.\r
+  # NETWORK_HTTP_ENABLE set to FALSE is not affecting NETWORK_HTTP_BOOT_ENABLE\r
+  # when NETWORK_HTTP_BOOT_ENABLE is TRUE.\r
+  DEFINE NETWORK_HTTP_ENABLE = FALSE\r
+!endif\r
+\r
 !ifndef NETWORK_HTTP_BOOT_ENABLE\r
   #\r
   # This flag is to enable or disable HTTP(S) boot feature.\r
   #\r
+  #\r
   DEFINE NETWORK_HTTP_BOOT_ENABLE = TRUE\r
 !endif\r
 \r
@@ -112,7 +125,9 @@
     !error "Must enable at least IP4 or IP6 stack if NETWORK_ENABLE is set to TRUE!"\r
   !endif\r
 \r
-  !if ($(NETWORK_HTTP_BOOT_ENABLE) == TRUE) AND ($(NETWORK_TLS_ENABLE) == FALSE) AND ($(NETWORK_ALLOW_HTTP_CONNECTIONS) == FALSE)\r
-    !error "Must enable TLS to support HTTPS, or allow unsecured HTTP connection, if NETWORK_HTTP_BOOT_ENABLE is set to TRUE!"\r
+  !if ($(NETWORK_HTTP_BOOT_ENABLE) == TRUE) OR ($(NETWORK_HTTP_ENABLE) == TRUE)\r
+    !if ($(NETWORK_TLS_ENABLE) == FALSE) AND ($(NETWORK_ALLOW_HTTP_CONNECTIONS) == FALSE)\r
+      !error "Must enable TLS to support HTTPS, or allow unsecured HTTP connection, if NETWORK_HTTP_BOOT_ENABLE or NETWORK_HTTP_ENABLE is set to TRUE!"\r
+    !endif\r
   !endif\r
 !endif\r

diff --git a/NetworkPkg/NetworkPkg.ci.yaml b/NetworkPkg/NetworkPkg.ci.yaml
index 1a3ab71792d1fa9b0bd6ab5d6b663a4091fa02aa..07dc7abd6938babf3b9fb18571ced64120ff9c82 100644 (file)
--- a/NetworkPkg/NetworkPkg.ci.yaml
+++ b/NetworkPkg/NetworkPkg.ci.yaml
@@ -3,6 +3,7 @@
 #\r
 # Copyright (c) Microsoft Corporation\r
 # Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 ##\r
 {\r
@@ -71,6 +72,7 @@
         "BLD_*_NETWORK_IP4_ENABLE": "TRUE",\r
         "BLD_*_NETWORK_IP6_ENABLE": "TRUE",\r
         "BLD_*_NETWORK_TLS_ENABLE": "TRUE",\r
+        "BLD_*_NETWORK_HTTP_ENABLE": "FALSE",\r
         "BLD_*_NETWORK_HTTP_BOOT_ENABLE": "TRUE",\r
         "BLD_*_NETWORK_ISCSI_ENABLE": "TRUE",\r
     }\r