From nobody Sun May 19 05:22:55 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+39780+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+39780+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556549426; cv=none; d=zoho.com; s=zohoarc; b=YvsnhmwWGVmu6DGS319PS2KGgB/LtcNFacrIsSTjw6ZSj9AxDJsHoOD2qDxY4pJrnbS2cbDAbKNAphj+1bdU4JDeues0eKQ+sEpxz7Xy+pMCiXDgRRvjLCUx52tApDaD3RowifylxjbYBPWIvSMTI70kDNiGMceUYMaZmcH8vfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556549426; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=MgWB9Iqdes+rq2e9NhITJ5IXvA7tnRFVswut51B0jHc=; b=UvhZODkWtagJkqW5riUFx4TmF8HPL+GX4CjmeT9CUfOKpjppM6gQSpjkGIPu7nHG9oJTkYe1137Yp7+N8xtKp68JegfJEbm5uR+woBpmgVrz6PGYZveFkjlAThZSIr/XY+SY4FsRvqQ0qRnh8dfgiLI+1KD3Wgfs1CJRHkcYIeA= 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+39780+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 1556549426117958.626058485529; Mon, 29 Apr 2019 07:50:26 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 07:50:25 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 07:50:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,409,1549958400"; d="scan'208";a="166071022" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.223]) by fmsmga004.fm.intel.com with ESMTP; 29 Apr 2019 07:50:24 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v4 1/3] NetworkPkg DSC: Add the required ARM library to pass ARM build Date: Mon, 29 Apr 2019 22:50:10 +0800 Message-Id: <20190429145012.14852-2-liming.gao@intel.com> In-Reply-To: <20190429145012.14852-1-liming.gao@intel.com> References: <20190429145012.14852-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=1556549425; bh=3eISmVq43D2/AN3JvBmaTprlQ2TY4L+dBY7wtXpRGCU=; h=Date:From:Reply-To:Subject:To; b=o6jxzeEhYRStf5LRS/18nzaO0NFxnlW0vpNCG1RakU8BtPkgyWIk6mQvX57Llx811QV Ersvdi3LqZuIFJlYy4n894c7WDF8LYDUjcyktrX3Ga92FCd+wq9ihUjNn73iAr+5pBc1j 8heodZ944Tz36SxfkClZDgPhVFv3W0jhzWE= 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 Reviewed-by: Laszlo Ersek --- NetworkPkg/NetworkPkg.dsc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index b5416b1614..be9d9248e4 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -72,6 +72,8 @@ # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 [PcdsFeatureFlag] gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE @@ -114,7 +116,7 @@ =20 NetworkPkg/Application/VConfig/VConfig.inf =20 -[Components.IA32, Components.X64] +[Components.IA32, Components.X64, Components.ARM, Components.AARCH64] NetworkPkg/IScsiDxe/IScsiDxe.inf NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf NetworkPkg/TlsDxe/TlsDxe.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 (#39780): https://edk2.groups.io/g/devel/message/39780 Mute This Topic: https://groups.io/mt/31384510/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 Sun May 19 05:22:55 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+39781+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+39781+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556549427; cv=none; d=zoho.com; s=zohoarc; b=ZrCG2csaOKEDF0UM+Sd6wP9NSkmC+S/pZKPfUJFLdmeifi6eIFB80bHTgRLt9CA1qbCGxvHJ5BowycoibSYU0RhhVjb/3k+T4SD4voydhTjIqadvYu5NZTPPc0+QhA9KXL+keGskxhxMm8W2zhYO5Rc258/16YxGRh+yfU/huwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556549427; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=nz/8yozzTXVXXTXK0OwaHu044g/1G3N2R0+8cN+04cs=; b=MG9AP5r+iNB4ctt8fnr/+MWyMyZQuAFtMcfgziXKLAjwwT9lk4dpT9OiLqEzy3uxcTlIAJC1ZWenQFOD7DhSd9WNwKeqFuKo4xeoZr4tBxr+LsRjrDTZQuc2QuOtjMkmwgY969RuV5gIONftrIDdDYxbhn33TKt830iDLzubpZM= 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+39781+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 1556549427158362.6712249616925; Mon, 29 Apr 2019 07:50:27 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 07:50:26 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 07:50:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,409,1549958400"; d="scan'208";a="166071032" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.223]) by fmsmga004.fm.intel.com with ESMTP; 29 Apr 2019 07:50:25 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Jiaxin Wu , Ting Ye , Fu Siyuan Subject: [edk2-devel] [Patch v4 2/3] NetworkPkg: Add DSC/FDF include segment files to NetworkPkg. Date: Mon, 29 Apr 2019 22:50:11 +0800 Message-Id: <20190429145012.14852-3-liming.gao@intel.com> In-Reply-To: <20190429145012.14852-1-liming.gao@intel.com> References: <20190429145012.14852-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=1556549426; bh=8thTIh86hD3+0swBgGKYZIWmgZEWJ8GoPhzIAH/SxmM=; h=Cc:Date:From:Reply-To:Subject:To; b=vEZPS2/qltrTcKkmqcuhJzPpqwU3iY8l75DQYrSouijtRH6pMZEbLRKviF9Sv1qoEI5 aTM4Z1NrkBDMvUJYuf0H518uynNt98mk9R6l7Vis3NbL9qBfjP+C8jSOCIP2U+BPz5nWr B/Y7XzlPwOW4FtXT0xj8dtL+7g2zyIWFiwk= 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 platform DSC file can diverge from the defaults in "NetworkDefines.dsc.inc" by setting the individual DEFINEs before including "NetworkDefines.dsc.inc". And, build command line ("-D FLAG=3DVALUE") can be used 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 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 | 118 +++++++++++++++++++++++++++++++= ++++ NetworkPkg/NetworkLibs.dsc.inc | 19 ++++++ NetworkPkg/NetworkPcds.dsc.inc | 16 +++++ 5 files changed, 270 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..a442d1b157 --- /dev/null +++ b/NetworkPkg/NetworkDefines.dsc.inc @@ -0,0 +1,118 @@ +## @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 +# +# 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 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 (#39781): https://edk2.groups.io/g/devel/message/39781 Mute This Topic: https://groups.io/mt/31384511/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 Sun May 19 05:22:55 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+39782+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+39782+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556549427; cv=none; d=zoho.com; s=zohoarc; b=DgifHjL+BFVZnJPh9w1pi0VCA3r0E5+2BnEJWsA1a7GaDPlHCqbhfFr3i6LT8ceJN+Rtp21jFzFWNgcdCJ9bCODU1b3lw6IlMHEPS3WIvgas6YZv3tFM7cMqrVU3EW8KfVMa5CCrc7yskPoJlTbTF8nOORxY0W6VIJ4A/oyeKsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556549427; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=vyYxQA26rajzuSNsK1v1WClPOLxeK28E6Ypy3EIEg2M=; b=J0iM6GHMtzKYb9H/dkqM0tUjWSrAt8I7eYEaymTFS0IamBLH8MFJgbKJoiUA+eafvscaDJaHWLpCAzGJjvG03clv5K350w5lurzclxdBSNm80hTYygEyrF1bZeLb3RPxeyaGAwPW50KuDa2cMw89mUaed7D5XFUwPasurqOCkY8= 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+39782+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 1556549427715773.7526064095804; Mon, 29 Apr 2019 07:50:27 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Mon, 29 Apr 2019 07:50:27 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 07:50:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,409,1549958400"; d="scan'208";a="166071034" X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.223]) by fmsmga004.fm.intel.com with ESMTP; 29 Apr 2019 07:50:26 -0700 From: "Liming Gao" To: devel@edk2.groups.io Subject: [edk2-devel] [Patch v4 3/3] NetworkPkg: Add package level include DSC file Date: Mon, 29 Apr 2019 22:50:12 +0800 Message-Id: <20190429145012.14852-4-liming.gao@intel.com> In-Reply-To: <20190429145012.14852-1-liming.gao@intel.com> References: <20190429145012.14852-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=1556549427; bh=4Y9dOEiqsACooWwEK0yY5KHsJvL0ZsCIXoyNbThjGfw=; h=Date:From:Reply-To:Subject:To; b=ryDyoedWmfLs250X/QmF7w6Axsb0nUKE4s+28mUV+pziICCggh8L2BP7jfs3EdLmY2T r2cEVf83Wx8UEuGmp7fcOx2zyVLV9hjYOEuOGFq1WPWZUBRCHY5jVc3ew4UmLga1yMt4C soFV0RjZd3YmIn+qyuBHsUsTtpJyL9WWvnI= 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 Acked-by: Laszlo Ersek --- NetworkPkg/Network.dsc.inc | 40 ++++++++++++++++++++++++++++++++++++++++ NetworkPkg/NetworkPkg.dsc | 22 +--------------------- 2 files changed, 41 insertions(+), 21 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..d51ee1b040 --- /dev/null +++ b/NetworkPkg/Network.dsc.inc @@ -0,0 +1,40 @@ +## @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". +#=20 +# This file defines one build flag PLATFORMX64_ENABLE to support=20 +# IA32 PEI and X64 DXE platform. Its default value is FALSE. +# +# Copyright (c) 2019, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] +!include NetworkPkg/NetworkDefines.dsc.inc + +!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 + +[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.AARCH64] +!include NetworkPkg/NetworkComponents.dsc.inc + +!endif diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index be9d9248e4..fe2fcf7b3c 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,24 +97,10 @@ ##########################################################################= ######################### =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 - NetworkPkg/Application/VConfig/VConfig.inf =20 -[Components.IA32, Components.X64, Components.ARM, Components.AARCH64] - 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 (#39782): https://edk2.groups.io/g/devel/message/39782 Mute This Topic: https://groups.io/mt/31384512/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-