From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: siyuan.fu@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Tue, 07 May 2019 07:53:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 May 2019 07:53:41 -0700 X-ExtLoop1: 1 Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga005.fm.intel.com with ESMTP; 07 May 2019 07:53:41 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 7 May 2019 07:53:40 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.70]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.10]) with mapi id 14.03.0415.000; Tue, 7 May 2019 22:53:38 +0800 From: "Siyuan, Fu" To: "devel@edk2.groups.io" , "Gao, Liming" CC: "Wu, Jiaxin" , "Ye, Ting" Subject: Re: [edk2-devel] [Patch v5 2/3] NetworkPkg: Add DSC/FDF include segment files to NetworkPkg. Thread-Topic: [edk2-devel] [Patch v5 2/3] NetworkPkg: Add DSC/FDF include segment files to NetworkPkg. Thread-Index: AQHVBOEJ8cOGUTh95k2BiyQAWhG9SqZfv3/g Date: Tue, 7 May 2019 14:53:38 +0000 Message-ID: References: <20190507142705.20092-1-liming.gao@intel.com> <20190507142705.20092-3-liming.gao@intel.com> In-Reply-To: <20190507142705.20092-3-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTQwMWRlZWEtMzg1Ni00Zjk3LWFjOWUtOGVkMjc1MjAyNWM5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiOWpINml4aE91eEJ3aTkxSVg0WERFa3RRNVZHRnBtSzBBcno4dVpBazNaV2c1WVJINlQrdlRqZFBJM04xclhtbSJ9 dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: siyuan.fu@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Siyuan Fu > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Li= ming > Gao > Sent: Tuesday, May 7, 2019 10:27 PM > To: devel@edk2.groups.io > Cc: Wu, Jiaxin ; Ye, Ting ; Fu, = Siyuan > > Subject: [edk2-devel] [Patch v5 2/3] NetworkPkg: Add DSC/FDF include seg= ment > files to NetworkPkg. >=20 > This patch provides a set of include segment files for platform owner to > easily enable/disable network stack support on their platform. >=20 > 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). >=20 > These files can be added to the platform DSC/FDF file by using > !include NetworkPkg/xxx > where "xxx" is the *.inc file name. >=20 > 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. >=20 > 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 >=20 > Related BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1293 >=20 > Cc: Jiaxin Wu > Cc: Ting Ye > Signed-off-by: Fu Siyuan > --- > NetworkPkg/Network.fdf.inc | 60 ++++++++++++++++++ > NetworkPkg/NetworkComponents.dsc.inc | 61 ++++++++++++++++++ > NetworkPkg/NetworkDefines.dsc.inc | 118 > +++++++++++++++++++++++++++++++++++ > NetworkPkg/NetworkLibs.dsc.inc | 20 ++++++ > NetworkPkg/NetworkPcds.dsc.inc | 16 +++++ > 5 files changed, 275 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 >=20 > diff --git a/NetworkPkg/Network.fdf.inc b/NetworkPkg/Network.fdf.inc > new file mode 100644 > index 0000000000..92e2c56cb8 > --- /dev/null > +++ b/NetworkPkg/Network.fdf.inc > @@ -0,0 +1,60 @@ > +## @file > +# Network FDF include file for All Architectures. > +# > +# This file can be included to a platform FDF by using > +# "!include NetworkPkg/Network.fdf.inc" to add EDKII network stack driv= ers > +# according to the value of flags described in "NetworkPkg/Network.dsc.= inc". > +# > +# Copyright (c) 2019, 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 > + > + !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > + !endif > + > +!endif > diff --git a/NetworkPkg/NetworkComponents.dsc.inc > b/NetworkPkg/NetworkComponents.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 Architectur= es. > +# > +# This file can be included to the [Components*] section(s) of a platfo= rm DSC > file > +# by using "!include NetworkPkg/NetworkComponents.dsc.inc" to specify t= he 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 = file > by > +# using "!include NetworkPkg/NetworkDefines.dsc.inc" to set default val= ue of > +# flags if they are not defined somewhere else, and also check the valu= e to > see > +# if there is any conflict. > +# > +# These flags can be defined before the !include line, or changed on th= e > command > +# 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 > feature, please > + # follow the instructions found in the file "OpenSSL-HOWTO.txt" > located in > + # CryptoPkg\Library\OpensslLib to enable the OpenSSL building f= irst. > + # The OpensslLib.inf library instance should be used since libs= sl 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 a= re > allowed. > + # Both the "https://" and "http://" URI schemes are permitted. > Otherwise, HTTP > + # connections are denied. Only the "https://" URI scheme is per= mitted. > + # > + 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 > feature, please > + # follow the instructions found in the file "OpenSSL-HOWTO.txt" > located in > + # CryptoPkg\Library\OpensslLib to enable the OpenSSL building f= irst. > + # Both OpensslLib.inf and OpensslLibCrypto.inf library instance= can > 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_ENAB= LE) =3D=3D > FALSE) AND ($(NETWORK_ALLOW_HTTP_CONNECTIONS) =3D=3D FALSE) > + !error "Must enable TLS to support HTTPS, or allow unsecured HTTP > connection, 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..a23f982381 > --- /dev/null > +++ b/NetworkPkg/NetworkLibs.dsc.inc > @@ -0,0 +1,20 @@ > +## @file > +# Network DSC include file for [LibraryClasses*] section of all Archite= ctures. > +# > +# This file can be included to the [LibraryClasses*] section(s) of a pl= atform > DSC file > +# by using "!include NetworkPkg/NetworkLibs.dsc.inc" to specify the lib= rary > 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 is used for Http Boot > + 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= file > +# by using "!include NetworkPkg/NetworkPcds.dsc.inc" to specify PCD set= tings > +# 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 > -- > 2.13.0.windows.1 >=20 >=20 >=20