From nobody Mon May 13 19:42:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39554+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39554+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556195891; cv=none; d=zoho.com; s=zohoarc; b=leTJTnQhn+iH2naDJQbdLnTbea7i/K+AYb+RJoW2hWjQiZrKig1nsk9LWfLp3zlhQuT1RLq4C4p5I6qKscZamM7lQw+FCoeUcNYNxgj9VlvOcDFbryIAvB/DOHMaxp32S1uXlByGtNqNruUWCFmV6nBS/pklH6UlQJKt8fnHS0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556195891; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=xzXAzqQsQ32yQ32djRMOa7HqFbEwmkbGCRR8LEIvZZ4=; b=VlwVgr8yHrcVRbF1hYk8laWGTsTn4HvBC8N6uo67xhtu5S8UP0eaHGjhcaawBdFuL4TgB3Lj7WnyaEyRxPMVE63GgcLfjIn6CNK1+RqFDPNKUjgGbX8eE8gEPeyDiD+ZiFPcsMsnsRpK39/nffVpDKZ3MYUhw47D+84Z0oujVOo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39554+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556195891729923.3119024250822; Thu, 25 Apr 2019 05:38:11 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com []) by groups.io with SMTP; Thu, 25 Apr 2019 05:38:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 05:38:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,393,1549958400"; d="scan'208";a="340712893" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by fmsmga006.fm.intel.com with ESMTP; 25 Apr 2019 05:38:10 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v3 1/3] NetworkPkg DSC: Add the required ARM library to pass ARM build Date: Thu, 25 Apr 2019 20:37:33 +0800 Message-Id: <20190425123735.10960-2-liming.gao@intel.com> In-Reply-To: <20190425123735.10960-1-liming.gao@intel.com> References: <20190425123735.10960-1-liming.gao@intel.com> 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556195891; bh=VFEMMo+1SxuXf3Bk2Mbzg3PUnWJBl618bnsreaPYUho=; h=Date:From:Reply-To:Subject:To; b=sUnaPv9AKAZsSWY1BBKRyNff71FYQXdIAqXozLtlOby0Aryn8Ic1984alF70TPqb2Tb MdaXay4qq0z97bobUD4gEXPiReRMzif36qz48BgWoFgSfblEd4cr/meH5SN3EdBDZ1h/v cXAtgPhfwuVGTtdT3X7gws6NFFAAb8+wIBQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Liming Gao --- NetworkPkg/NetworkPkg.dsc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index 66d43bec12..955e45e84d 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -55,6 +55,7 @@ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [LibraryClasses.common.UEFI_DRIVER] HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf @@ -72,6 +73,7 @@ # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 [PcdsFeatureFlag] gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE @@ -115,7 +117,7 @@ NetworkPkg/Application/IpsecConfig/IpSecConfig.inf NetworkPkg/Application/VConfig/VConfig.inf =20 -[Components.IA32, Components.X64] +[Components.IA32, Components.X64, Components.ARM, Components.AARCH64] NetworkPkg/IpSecDxe/IpSecDxe.inf NetworkPkg/IScsiDxe/IScsiDxe.inf NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf --=20 2.13.0.windows.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 (#39554): https://edk2.groups.io/g/devel/message/39554 Mute This Topic: https://groups.io/mt/31341793/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- From nobody Mon May 13 19:42:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39555+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39555+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556195900; cv=none; d=zoho.com; s=zohoarc; b=nusz72nVcLRxPZZyisXmBBO3G/8wso5OJdmE+2oqtgpVLFMCnUce5tdvuUCiFDKtLwCFVAhJNUFJcvZFj5/KoBNzTvkkaAN4xLinAzy/ME1QFy8Xu8H9Ty00lJxzU/inyitD0qbe4Z+qKj51G578cw+6rWGmNjUQdLcJB9bGAG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556195900; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=y3gQrcE6h7CWIp1TZGFawCoCRsPluTeMSKk01MdcOEY=; b=AdzVln660A+Ub8Cb3W3LwHAfQRCnLo6q922b3l0iupyuKETd1AN1h/3iI4b+cmIUBxCwRx3U9+hI+4N0cI/CAX/8APIZJgT0iHe5p8DG5JAb5KxrhWxBh9/r/9PLtSYenJWA2sroWTSkZYk4ubqFutwmv9uMxKcix0/UveZohvM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39555+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15561959007168.505793024084369; Thu, 25 Apr 2019 05:38:20 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Thu, 25 Apr 2019 05:38:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 05:38:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,393,1549958400"; d="scan'208";a="340712904" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by fmsmga006.fm.intel.com with ESMTP; 25 Apr 2019 05:38:10 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Jiaxin Wu , Ting Ye , Fu Siyuan Subject: [edk2-devel] [Patch v3 2/3] NetworkPkg: Add DSC/FDF include segment files to NetworkPkg. Date: Thu, 25 Apr 2019 20:37:34 +0800 Message-Id: <20190425123735.10960-3-liming.gao@intel.com> In-Reply-To: <20190425123735.10960-1-liming.gao@intel.com> References: <20190425123735.10960-1-liming.gao@intel.com> 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556195900; bh=6hBOr3tYsQSYpiH98JJCxBZR38s59/FRYDY8rk/6tFI=; h=Cc:Date:From:Reply-To:Subject:To; b=vhiZQqhJztRPRUlpuhiecPlC94zkd7V0ClYifaKHu39GZzKXt3btjrUN7OHSYvr1VAI tk0Xel5FHOkeHmbQQJdEXN33w5/dKuiloylyt2WEnYfQGw8eVsAGvArGdWgTCWPNeRTxm +cSkge2+b4s2FIElmV0Ff6DpTkH+dh9InvI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch provides a set of include segment files for platform owner to easily enable/disable network stack support on their platform. For DSC, there are: - a "NetworkDefines.dsc.inc" for the [Defines] section(s), - a "NetworkLibs.dsc.inc" for the [LibraryClasses*] section(s), - a "NetworkPcds.dsc.inc" for the [Pcds*] section(s), - a "NetworkComponents.dsc.inc" for the [Components*] section(s). For FDF, there is: - a "Network.fdf.inc" for the [Fv*] section(s). These files can be added to the platform DSC/FDF file by using !include NetworkPkg/xxx where "xxx" is the *.inc file name. A set of flags can be changed before the include line or in build command line ("-D FLAG=3DVALUE") to enable or disable related feature set, please check "NetworkDefines.dsc.inc" for a detail description of each flag. The default value of these flags are: DEFINE NETWORK_ENABLE =3D TRUE DEFINE NETWORK_SNP_ENABLE =3D TRUE DEFINE NETWORK_IP4_ENABLE =3D TRUE DEFINE NETWORK_IP6_ENABLE =3D TRUE DEFINE NETWORK_TLS_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 DEFINE PLATFORMX64_ENABLE =3D FALSE Related BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1293 Cc: Jiaxin Wu Cc: Ting Ye Signed-off-by: Fu Siyuan --- NetworkPkg/Network.fdf.inc | 56 ++++++++++++++++ NetworkPkg/NetworkComponents.dsc.inc | 61 +++++++++++++++++ NetworkPkg/NetworkDefines.dsc.inc | 126 +++++++++++++++++++++++++++++++= ++++ NetworkPkg/NetworkLibs.dsc.inc | 19 ++++++ NetworkPkg/NetworkPcds.dsc.inc | 16 +++++ 5 files changed, 278 insertions(+) create mode 100644 NetworkPkg/Network.fdf.inc create mode 100644 NetworkPkg/NetworkComponents.dsc.inc create mode 100644 NetworkPkg/NetworkDefines.dsc.inc create mode 100644 NetworkPkg/NetworkLibs.dsc.inc create mode 100644 NetworkPkg/NetworkPcds.dsc.inc diff --git a/NetworkPkg/Network.fdf.inc b/NetworkPkg/Network.fdf.inc new file mode 100644 index 0000000000..8518bad12c --- /dev/null +++ b/NetworkPkg/Network.fdf.inc @@ -0,0 +1,56 @@ +## @file +# Network FDF include file for All Architectures. +# +# This file can be included to a platform FDF by using "!include NetworkPk= g/Network.fdf.inc" +# to add EDKII network stack drivers according to the value of flags descr= ibed in +# "NetworkPkg/Network.dsc.inc". +# +# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# + +!if $(NETWORK_ENABLE) =3D=3D TRUE + INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf + + !if $(NETWORK_SNP_ENABLE) =3D=3D TRUE + INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf + !endif + + !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE + INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf + !endif + + INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf + + !if $(NETWORK_IP4_ENABLE) =3D=3D TRUE + 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/Udp4Dxe/Udp4Dxe.inf + INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf + !endif + + !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE + INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf + INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf + INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf + INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf + !endif + + INF NetworkPkg/TcpDxe/TcpDxe.inf + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf + + !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + INF NetworkPkg/TlsDxe/TlsDxe.inf + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf + !endif + + !if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE + INF NetworkPkg/DnsDxe/DnsDxe.inf + INF NetworkPkg/HttpDxe/HttpDxe.inf + INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf + INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf + !endif + +!endif diff --git a/NetworkPkg/NetworkComponents.dsc.inc b/NetworkPkg/NetworkCompo= nents.dsc.inc new file mode 100644 index 0000000000..aede5ea8be --- /dev/null +++ b/NetworkPkg/NetworkComponents.dsc.inc @@ -0,0 +1,61 @@ +## @file +# Network DSC include file for [Components*] section of all Architectures. +# +# This file can be included to the [Components*] section(s) of a platform = DSC file +# by using "!include NetworkPkg/NetworkComponents.dsc.inc" to specify the = INF files +# of EDKII network drivers according to the value of flags described in +# "NetworkDefines.dsc.inc". +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +!if $(NETWORK_ENABLE) =3D=3D TRUE + MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf + + !if $(NETWORK_SNP_ENABLE) =3D=3D TRUE + MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf + !endif + + !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE + MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf + !endif + + MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf + + !if $(NETWORK_IP4_ENABLE) =3D=3D TRUE + MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf + MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf + MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf + MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf + MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf + !endif + + !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE + NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf + NetworkPkg/Ip6Dxe/Ip6Dxe.inf + NetworkPkg/Udp6Dxe/Udp6Dxe.inf + NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf + !endif + + NetworkPkg/TcpDxe/TcpDxe.inf + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf + + !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + NetworkPkg/TlsDxe/TlsDxe.inf + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf + !endif + + !if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE + NetworkPkg/DnsDxe/DnsDxe.inf + NetworkPkg/HttpDxe/HttpDxe.inf + NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf + NetworkPkg/HttpBootDxe/HttpBootDxe.inf + !endif + + !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE + NetworkPkg/IScsiDxe/IScsiDxe.inf + !endif +!endif diff --git a/NetworkPkg/NetworkDefines.dsc.inc b/NetworkPkg/NetworkDefines.= dsc.inc new file mode 100644 index 0000000000..7a318c98ca --- /dev/null +++ b/NetworkPkg/NetworkDefines.dsc.inc @@ -0,0 +1,126 @@ +## @file +# Network DSC include file for [Defines] section of all Architectures. +# +# This file can be included to the [Defines] section of a platform DSC fil= e by +# using "!include NetworkPkg/NetworkDefines.dsc.inc" to set default value = of +# flags if they are not defined somewhere else, and also check the value t= o see +# if there is any conflict. +# +# These flags can be defined before the !include line, or changed on the c= ommand +# line to enable or disable related feature support. +# -D FLAG=3DVALUE +# The default value of these flags are: +# DEFINE NETWORK_ENABLE =3D TRUE +# DEFINE NETWORK_SNP_ENABLE =3D TRUE +# DEFINE NETWORK_IP4_ENABLE =3D TRUE +# DEFINE NETWORK_IP6_ENABLE =3D TRUE +# DEFINE NETWORK_TLS_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 +# DEFINE PLATFORMX64_ENABLE =3D FALSE +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +!ifndef NETWORK_ENABLE + # + # This flag is to enable or disable the whole network stack. + # + DEFINE NETWORK_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_SNP_ENABLE + # + # This flag is to include the common SNP driver or not. + # + DEFINE NETWORK_SNP_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_VLAN_ENABLE + # + # This flag is to enable or disable VLAN feature. + # + DEFINE NETWORK_VLAN_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_IP4_ENABLE + # + # This flag is to enable or disable IPv4 network stack. + # + DEFINE NETWORK_IP4_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_IP6_ENABLE + # + # This flag is to enable or disable IPv6 network stack. + # + DEFINE NETWORK_IP6_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_TLS_ENABLE + # + # This flag is to enable or disable TLS feature. + # + # Note: This feature depends on the OpenSSL building. To enable this fea= ture, please + # follow the instructions found in the file "OpenSSL-HOWTO.txt" lo= cated in + # CryptoPkg\Library\OpensslLib to enable the OpenSSL building firs= t. + # The OpensslLib.inf library instance should be used since libssl = is required. + # + DEFINE NETWORK_TLS_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_HTTP_BOOT_ENABLE + # + # This flag is to enable or disable HTTP(S) boot feature. + # + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D TRUE +!endif + +!ifndef NETWORK_ALLOW_HTTP_CONNECTIONS + # + # Indicates whether HTTP connections (i.e., unsecured) are permitted or = not. + # + # Note: If NETWORK_ALLOW_HTTP_CONNECTIONS is TRUE, HTTP connections are = allowed. + # Both the "https://" and "http://" URI schemes are permitted. Oth= erwise, HTTP + # connections are denied. Only the "https://" URI scheme is permit= ted. + # + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D FALSE +!endif + +!ifndef NETWORK_ISCSI_ENABLE + # + # This flag is to enable or disable iSCSI feature. + # + # Note: This feature depends on the OpenSSL building. To enable this fea= ture, please + # follow the instructions found in the file "OpenSSL-HOWTO.txt" lo= cated in + # CryptoPkg\Library\OpensslLib to enable the OpenSSL building firs= t. + # Both OpensslLib.inf and OpensslLibCrypto.inf library instance ca= n be used + # since libssl is not required for iSCSI. + # + DEFINE NETWORK_ISCSI_ENABLE =3D TRUE +!endif + +!if $(NETWORK_ENABLE) =3D=3D TRUE + # + # Check the flags to see if there is any conflict. + # + !if ($(NETWORK_IP4_ENABLE) =3D=3D FALSE) AND ($(NETWORK_IP6_ENABLE) =3D= =3D FALSE) + !error "Must enable at least IP4 or IP6 stack if NETWORK_ENABLE is set= to TRUE!" + !endif + + !if ($(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE) AND ($(NETWORK_TLS_ENABLE)= =3D=3D FALSE) AND ($(NETWORK_ALLOW_HTTP_CONNECTIONS) =3D=3D FALSE) + !error "Must enable TLS to support HTTPS, or allow unsecured HTTP conn= ection, if NETWORK_HTTP_BOOT_ENABLE is set to TRUE!" + !endif +!endif + +!ifndef PLATFORMX64_ENABLE + # + # PLATFORMX64_ENABLE is set to TRUE when PEI is IA32 and DXE is X64 plat= form + # + DEFINE PLATFORMX64_ENABLE =3D FALSE +!endif diff --git a/NetworkPkg/NetworkLibs.dsc.inc b/NetworkPkg/NetworkLibs.dsc.inc new file mode 100644 index 0000000000..dac6b37c6a --- /dev/null +++ b/NetworkPkg/NetworkLibs.dsc.inc @@ -0,0 +1,19 @@ +## @file +# Network DSC include file for [LibraryClasses*] section of all Architectu= res. +# +# This file can be included to the [LibraryClasses*] section(s) of a platf= orm DSC file +# by using "!include NetworkPkg/NetworkLibs.dsc.inc" to specify the librar= y instances +# of EDKII network library classes. +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + + DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf + NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf + IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf + UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf + HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf diff --git a/NetworkPkg/NetworkPcds.dsc.inc b/NetworkPkg/NetworkPcds.dsc.inc new file mode 100644 index 0000000000..f874b382ef --- /dev/null +++ b/NetworkPkg/NetworkPcds.dsc.inc @@ -0,0 +1,16 @@ +## @file +# Network DSC include file for [Pcds*] section of all Architectures. +# +# This file can be included to the [Pcds*] section(s) of a platform DSC fi= le +# by using "!include NetworkPkg/NetworkPcds.dsc.inc" to specify PCD settin= gs +# according to the value of flags described in "NetworkDefines.dsc.inc". +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +!if $(NETWORK_ALLOW_HTTP_CONNECTIONS) =3D=3D TRUE + gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE +!endif --=20 2.13.0.windows.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 (#39555): https://edk2.groups.io/g/devel/message/39555 Mute This Topic: https://groups.io/mt/31341797/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- From nobody Mon May 13 19:42:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39556+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39556+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556195900; cv=none; d=zoho.com; s=zohoarc; b=Ag0s3uGamtQ7ZX9H62cVuWdzMAw57JwmGsp+JWWENpImB2LiQr8UJf3r24Gyf4G9BRuQTYhrIkZ5yFeyrf/ie1Z6VrQseMZBo35HiY9IKJhyoVX+YRc2C2uBgXb1SFCcgC7LFaV1CBm+O1Bqr2U39z2AsPnu2f+WlJykfPUnuGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556195900; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=u6tRRpoztcFIfuv0MxasNZBew+am1gBddSStbpzhneo=; b=M7Lo1m4B2dBdJXUJovcejLvEUR0S5EZ614tImnILv2MHyUVo5niopmBk/PFrc9SA1O1OXAh8OmXxA2UMjIcjG96+iLVpc9RCa3VLJIvmkaJd+00E8sYTPeaYe0VtWsfzOoaLBKHm+NBhAED30tGzdh7zqpV1/p6jyhbTkNT8/sI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39556+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556195900977422.8799100489755; Thu, 25 Apr 2019 05:38:20 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com []) by groups.io with SMTP; Thu, 25 Apr 2019 05:38:20 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 05:38:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,393,1549958400"; d="scan'208";a="340712906" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.29.102]) by fmsmga006.fm.intel.com with ESMTP; 25 Apr 2019 05:38:11 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file Date: Thu, 25 Apr 2019 20:37:35 +0800 Message-Id: <20190425123735.10960-4-liming.gao@intel.com> In-Reply-To: <20190425123735.10960-1-liming.gao@intel.com> References: <20190425123735.10960-1-liming.gao@intel.com> 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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556195900; bh=LB9vaKKEvgZD5JeoSfqf1vmUiaFxoq1B3SBF/NXN+uc=; h=Date:From:Reply-To:Subject:To; b=H8REyZXic5Meb3KaO3Pnp22BL33rOfzHWTR/YucwFBfbZadA+gusGx33fGttD4JPVLy lXWuftX/S/nGe7ns7B6qt5kzHcD89l/TfccrW+cSomeHAgOXDZ2MGbUTpt15+xwYQYXoc YnpKxZPYJ8WeCaTT2BGIxsdC/8FcsXGLOzo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Platform DSC can include Network.dsc.inc to enable network features. Signed-off-by: Liming Gao --- NetworkPkg/Network.dsc.inc | 30 ++++++++++++++++++++++++++++++ NetworkPkg/NetworkPkg.dsc | 23 +---------------------- 2 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 NetworkPkg/Network.dsc.inc diff --git a/NetworkPkg/Network.dsc.inc b/NetworkPkg/Network.dsc.inc new file mode 100644 index 0000000000..5a808be4e5 --- /dev/null +++ b/NetworkPkg/Network.dsc.inc @@ -0,0 +1,30 @@ +## @file +# Network DSC include file for Platform DSC +# +# This file includes all required information to enable Network features. +# It can be included to a platform DSC file by using "!include NetworkPkg/= Network.dsc.inc". +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] +!include NetworkPkg/NetworkDefines.dsc.inc + +[PcdsFixedAtBuild] +!include NetworkPkg/NetworkPcds.dsc.inc + +[LibraryClasses] +!include NetworkPkg/NetworkLibs.dsc.inc + +!if $(PLATFORMX64_ENABLE) =3D=3D TRUE +[Components.X64] +!include NetworkPkg/NetworkComponents.dsc.inc + +!else +[Components.IA32, Components.X64, Components.ARM, Components.AARCH6] +!include NetworkPkg/NetworkComponents.dsc.inc + +!endif diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index 955e45e84d..4cec3199ec 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -41,12 +41,6 @@ DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableL= ib.inf SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf =20 - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf @@ -103,26 +97,11 @@ ##########################################################################= ######################### =20 [Components] - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf =20 - NetworkPkg/Application/IpsecConfig/IpSecConfig.inf NetworkPkg/Application/VConfig/VConfig.inf =20 -[Components.IA32, Components.X64, Components.ARM, Components.AARCH64] - NetworkPkg/IpSecDxe/IpSecDxe.inf - NetworkPkg/IScsiDxe/IScsiDxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf + !include NetworkPkg/Network.dsc.inc =20 [BuildOptions] *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACES --=20 2.13.0.windows.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 (#39556): https://edk2.groups.io/g/devel/message/39556 Mute This Topic: https://groups.io/mt/31341798/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-