From nobody Fri May 3 13:35:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67287+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67287+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=hpe.com ARC-Seal: i=1; a=rsa-sha256; t=1605103594; cv=none; d=zohomail.com; s=zohoarc; b=i3JpHNLwVGBBPIdT/QacwUtbmFCaxuJFpx3F4k20h2Rzn9AxjUYbDarlp/Zg4ZFwXKSCw2i8HDiVZ1H+1h2YymlxGFsWdEpe3E6LbLJKJopdSYSCawY5cxVYMiBVFFgQI0VBwZR+DiVLjRiT1WZR6JnmPtmZdTYgeoxxQDLQ8nU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605103594; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=GMzpZLBlWiZ7AcChN5NEWF+wh8DyMbloSkU6X+rJSmw=; b=ckSBEAVPE3agNPE3MSv7GC8bbTZIRZMID55VIndljcdwY2JVrcz10jXuJD6U/ObeiuXn5xbM2mZ5RaO4fg8h2qekqIIrY1uXc5KgIYbxySOSmhKT25haO60OdJqL2JbDrXmU/bnirwckRR0OpAjXCniPG3O3puq4Pmqwo4Q0Zlg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+67287+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1605103594664213.50494362387474; Wed, 11 Nov 2020 06:06:34 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZlStYY1788612xXnHZf1RV3X; Wed, 11 Nov 2020 06:06:31 -0800 X-Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web12.6955.1605103523329005629 for ; Wed, 11 Nov 2020 06:05:23 -0800 X-Received: from pps.filterd (m0148664.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0ABE29ap029908; Wed, 11 Nov 2020 14:05:21 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 34r0497qx1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 11 Nov 2020 14:05:20 +0000 X-Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id 5F0656D; Wed, 11 Nov 2020 14:05:19 +0000 (UTC) X-Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id CD40942; Wed, 11 Nov 2020 14:05:17 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Maciej Rabeda , Jiaxin Wu , Siyuan Fu , Laszlo Ersek , Nickle Wang , Peter O'Hanley Subject: [edk2-devel] [NETWORK_HTTP_ENABLE PATCH 1/1] NetworkPkg: Add NETWORK_HTTP_ENABLE macro Date: Wed, 11 Nov 2020 21:19:27 +0800 Message-Id: <20201111131927.21323-2-abner.chang@hpe.com> In-Reply-To: <20201111131927.21323-1-abner.chang@hpe.com> References: <20201111131927.21323-1-abner.chang@hpe.com> X-HPE-SCL: -1 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,abner.chang@hpe.com X-Gm-Message-State: ATPfO98ysI4HxgpvbD8wtIWOx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1605103591; bh=37cUHze4hNWvuUGvAcKoAM4H6+yhK4VgAvENViqBqDM=; h=Cc:Date:From:Reply-To:Subject:To; b=EV7I63ViXtGymYoHhLdzvpW6Io2E6DQ586GXqsv+OEdjGNbzkgMUxJ5Apjpe/dXv0W3 /PJA/GHJT133KkIlPV51lJo8cidVExFZrNkNzkfFfndi0pq9OxRwd6bDF7nDtwOBq3DKy 9zYtwXZUcBJPIobwLixM2G3XFS7d8ij3wf8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" BZ:2917 Add NETWORK_HTTP_ENABLE macro and separate HttpDxe and HttpUtilitiesDxe drivers from HTTP_NETWORK_HTTP_BOOT_ENABLE macro. Signed-off-by: Abner Chang Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Laszlo Ersek Cc: Nickle Wang Cc: Peter O'Hanley --- NetworkPkg/Network.fdf.inc | 5 ++++- NetworkPkg/NetworkComponents.dsc.inc | 5 ++++- NetworkPkg/NetworkDefines.dsc.inc | 9 +++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/NetworkPkg/Network.fdf.inc b/NetworkPkg/Network.fdf.inc index 803a0d64fd..8a662ad1de 100644 --- a/NetworkPkg/Network.fdf.inc +++ b/NetworkPkg/Network.fdf.inc @@ -46,10 +46,13 @@ INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf !endif =20 - !if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE + !if ($(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE) OR ($(NETWORK_HTTP_ENABLE)= =3D=3D TRUE) INF NetworkPkg/DnsDxe/DnsDxe.inf INF NetworkPkg/HttpDxe/HttpDxe.inf INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf + !endif + + !if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf !endif =20 diff --git a/NetworkPkg/NetworkComponents.dsc.inc b/NetworkPkg/NetworkCompo= nents.dsc.inc index 40cb8ee18e..21cb62082f 100644 --- a/NetworkPkg/NetworkComponents.dsc.inc +++ b/NetworkPkg/NetworkComponents.dsc.inc @@ -48,10 +48,13 @@ NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf !endif =20 - !if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE + !if ($(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE) OR ($(NETWORK_HTTP_ENABLE)= =3D=3D TRUE) NetworkPkg/DnsDxe/DnsDxe.inf NetworkPkg/HttpDxe/HttpDxe.inf NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf + !endif + + !if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE NetworkPkg/HttpBootDxe/HttpBootDxe.inf !endif =20 diff --git a/NetworkPkg/NetworkDefines.dsc.inc b/NetworkPkg/NetworkDefines.= dsc.inc index a442d1b157..6f274582a8 100644 --- a/NetworkPkg/NetworkDefines.dsc.inc +++ b/NetworkPkg/NetworkDefines.dsc.inc @@ -15,12 +15,14 @@ # DEFINE NETWORK_IP4_ENABLE =3D TRUE # DEFINE NETWORK_IP6_ENABLE =3D TRUE # DEFINE NETWORK_TLS_ENABLE =3D TRUE +# DEFINE NETWORK_HTTP_ENABLE =3D TRUE # DEFINE NETWORK_HTTP_BOOT_ENABLE =3D TRUE # DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D FALSE # DEFINE NETWORK_ISCSI_ENABLE =3D TRUE # DEFINE NETWORK_VLAN_ENABLE =3D TRUE # # Copyright (c) 2019, Intel Corporation. All rights reserved.
+# (C) Copyright 2020 Hewlett Packard Enterprise Development LP
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -73,6 +75,13 @@ DEFINE NETWORK_TLS_ENABLE =3D TRUE !endif =20 +!ifndef NETWORK_HTTP_ENABLE + # + # This flag is to enable or disable HTTP(S) feature. + # + DEFINE NETWORK_HTTP_ENABLE =3D TRUE +!endif + !ifndef NETWORK_HTTP_BOOT_ENABLE # # This flag is to enable or disable HTTP(S) boot feature. --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#67287): https://edk2.groups.io/g/devel/message/67287 Mute This Topic: https://groups.io/mt/78182924/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-