From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 991E521B02822 for ; Thu, 22 Nov 2018 02:52:30 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2018 02:52:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,265,1539673200"; d="scan'208";a="93144927" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga006.jf.intel.com with ESMTP; 22 Nov 2018 02:52:29 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 22 Nov 2018 02:52:28 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.214]) with mapi id 14.03.0415.000; Thu, 22 Nov 2018 18:52:27 +0800 From: "Fu, Siyuan" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Wu, Jiaxin" , "Gao, Liming" Thread-Topic: [edk2] [PATCH v2 1/6] NetworkPkg: Add DSC/FDF include segment files to NetworkPkg. Thread-Index: AQHUgiNk2z9vaJI/IUWVaGItTYB4mKVbCPmAgACUnAA= Date: Thu, 22 Nov 2018 10:52:26 +0000 Message-ID: References: <20181122052153.89464-1-siyuan.fu@intel.com> <20181122052153.89464-2-siyuan.fu@intel.com> <734D49CCEBEEF84792F5B80ED585239D5BF13F63@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5BF13F63@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTk4YWZmMWItNWEyNS00NWMwLTljZjYtMmZmMjk3NjM2MTczIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiSmxcL1NIWXNGRjVCM0VaMHRBekFwMzNBK3V2VDNzWGFNc0tkbm9Eam92MWY5dUxNdzcwR3JKbGtUakszRHZzbUMifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 1/6] NetworkPkg: Add DSC/FDF include segment files to NetworkPkg. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 10:52:30 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Ray It was one single file in v1 patch and I split it to 4 files in v2. Because= there will be some problems if we include the section header, see Laszlo's= comments on https://lists.01.org/pipermail/edk2-devel/2018-November/03277= 4.html BestRegards Fu Siyuan > -----Original Message----- > From: Ni, Ruiyu > Sent: Thursday, November 22, 2018 5:57 PM > To: Fu, Siyuan ; edk2-devel@lists.01.org > Cc: Ye, Ting ; Wu, Jiaxin ; Gao, > Liming > Subject: RE: [edk2] [PATCH v2 1/6] NetworkPkg: Add DSC/FDF include segmen= t > files to NetworkPkg. >=20 > Siyuan, > Can you merge all the dsc.inc together like below content? > [Defines] > ... > [LIbraryClasses] > ... > ... >=20 > Through this way, platform only needs include once in DSC. >=20 > Thanks/Ray >=20 > > -----Original Message----- > > From: edk2-devel On Behalf Of Fu > > Siyuan > > Sent: Thursday, November 22, 2018 1:22 PM > > To: edk2-devel@lists.01.org > > Cc: Ye, Ting ; Wu, Jiaxin > > Subject: [edk2] [PATCH v2 1/6] NetworkPkg: Add DSC/FDF include segment > > files to NetworkPkg. > > > > This patch provides a set of include segment files for platform owner t= o > 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 ch= eck > > "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_IPSEC_ENABLE =3D TRUE > > 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 > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Fu Siyuan > > --- > > > > Notes: > > v2: > > 1. Split the "Network.dsc.inc" in to 4 files for different sections > in DSC > > file. This could provide more flexibility to platform owner to use > the > > include files. > > 2. Clarify the OpenSSL dependency of TLS, iSCSI and IPsec enable > flag. > > 3. Use "!error" statement for incorrect flag value check. > > 4. Other decoration work according to Laszlo's comments. > > > > NetworkPkg/Network.fdf.inc | 69 ++++++++++ > > NetworkPkg/NetworkComponents.dsc.inc | 71 ++++++++++ > > NetworkPkg/NetworkDefines.dsc.inc | 138 ++++++++++++++++++++ > > NetworkPkg/NetworkLibs.dsc.inc | 25 ++++ > > NetworkPkg/NetworkPcds.dsc.inc | 22 ++++ > > NetworkPkg/NetworkPkg.dsc | 28 +--- > > 6 files changed, 331 insertions(+), 22 deletions(-) > > > > diff --git a/NetworkPkg/Network.fdf.inc b/NetworkPkg/Network.fdf.inc ne= w > > file mode 100644 index 000000000000..abd4c6c363d5 > > --- /dev/null > > +++ b/NetworkPkg/Network.fdf.inc > > @@ -0,0 +1,69 @@ > > +## @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 drivers according to the value of flags > > +described in # "NetworkDefines.dsc.inc". > > +# > > +# Copyright (c) 2018, Intel Corporation. All rights reserved.
# > > +# This program and the accompanying materials > > +# are licensed and made available under the terms and conditions of > the > > BSD License > > +# which accompanies this distribution. The full text of the license > may be > > found at > > +# http://opensource.org/licenses/bsd-license.php > > +# > > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > BASIS, > > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > EXPRESS OR IMPLIED. > > +# > > + > > +!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 > > + > > + !if $(NETWORK_IPSEC_ENABLE) =3D=3D TRUE > > + INF NetworkPkg/IpSecDxe/IpSecDxe.inf > > + !endif > > +!endif > > diff --git a/NetworkPkg/NetworkComponents.dsc.inc > > b/NetworkPkg/NetworkComponents.dsc.inc > > new file mode 100644 > > index 000000000000..8074489b8e06 > > --- /dev/null > > +++ b/NetworkPkg/NetworkComponents.dsc.inc > > @@ -0,0 +1,71 @@ > > +## @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) 2018, Intel Corporation. All rights reserved.
# > > +# This program and the accompanying materials > > +# are licensed and made available under the terms and conditions of > the > > BSD License > > +# which accompanies this distribution. The full text of the license > may be > > found at > > +# http://opensource.org/licenses/bsd-license.php > > +# > > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > BASIS, > > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > EXPRESS OR IMPLIED. > > +# > > +## > > + > > +!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 > > + > > + !if $(NETWORK_IPSEC_ENABLE) =3D=3D TRUE > > + NetworkPkg/IpSecDxe/IpSecDxe.inf > > + !endif > > +!endif > > diff --git a/NetworkPkg/NetworkDefines.dsc.inc > > b/NetworkPkg/NetworkDefines.dsc.inc > > new file mode 100644 > > index 000000000000..648c065baadb > > --- /dev/null > > +++ b/NetworkPkg/NetworkDefines.dsc.inc > > @@ -0,0 +1,138 @@ > > +## @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 value of # flags if they are not defined somewhere else, and > > +also check the value to see # if there is any conflict. > > +# > > +# These flags can be defined before the !include line, or changed on > > +the 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_IPSEC_ENABLE =3D TRUE > > +# DEFINE NETWORK_ISCSI_ENABLE =3D TRUE > > +# DEFINE NETWORK_VLAN_ENABLE =3D TRUE > > +# > > +# Copyright (c) 2018, Intel Corporation. All rights reserved.
# > > +# This program and the accompanying materials > > +# are licensed and made available under the terms and conditions of > the > > BSD License > > +# which accompanies this distribution. The full text of the license > may be > > found at > > +# http://opensource.org/licenses/bsd-license.php > > +# > > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > BASIS, > > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > EXPRESS OR IMPLIED. > > +# > > +## > > + > > +!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 > first. > > + # 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. > > Otherwise, HTTP > > + # connections are denied. Only the "https://" URI scheme is > permitted. > > + # > > + 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 > first. > > + # Both OpensslLib.inf and OpensslLibCrypto.inf library instanc= e > can be > > used > > + # since libssl is not required for iSCSI. > > + # > > + DEFINE NETWORK_ISCSI_ENABLE =3D TRUE > > +!endif > > + > > +!ifndef NETWORK_IPSEC_ENABLE > > + # > > + # This flag is to enable or disable IPsec 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 > first. > > + # Both OpensslLib.inf and OpensslLibCrypto.inf library instanc= e > can be > > used > > + # since libssl is not required for IPsec. > > + # > > + DEFINE NETWORK_IPSEC_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 > > 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 > > 000000000000..67d09c262074 > > --- /dev/null > > +++ b/NetworkPkg/NetworkLibs.dsc.inc > > @@ -0,0 +1,25 @@ > > +## @file > > +# Network DSC include file for [LibraryClasses*] section of all > Architectures. > > +# > > +# This file can be included to the [LibraryClasses*] section(s) of a > > +platform DSC file # by using "!include NetworkPkg/NetworkLibs.dsc.inc" > > +to specify the library instances # of EDKII network library classes. > > +# > > +# Copyright (c) 2018, Intel Corporation. All rights reserved.
# > > +# This program and the accompanying materials > > +# are licensed and made available under the terms and conditions of > the > > BSD License > > +# which accompanies this distribution. The full text of the license > may be > > found at > > +# http://opensource.org/licenses/bsd-license.php > > +# > > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > BASIS, > > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > EXPRESS OR IMPLIED. > > +# > > +## > > + > > + 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 > > 000000000000..3eee5b3ae0bf > > --- /dev/null > > +++ b/NetworkPkg/NetworkPcds.dsc.inc > > @@ -0,0 +1,22 @@ > > +## @file > > +# Network DSC include file for [Pcds*] section of all Architectures. > > +# > > +# This file can be included to the [Pcds*] section(s) of a platform DS= C > > +file # by using "!include NetworkPkg/NetworkPcds.dsc.inc" to specify > > +PCD settings # according to the value of flags described in > > "NetworkDefines.dsc.inc". > > +# > > +# Copyright (c) 2018, Intel Corporation. All rights reserved.
# > > +# This program and the accompanying materials > > +# are licensed and made available under the terms and conditions of > the > > BSD License > > +# which accompanies this distribution. The full text of the license > may be > > found at > > +# http://opensource.org/licenses/bsd-license.php > > +# > > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > > BASIS, > > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > > EXPRESS OR IMPLIED. > > +# > > +## > > + > > +!if $(NETWORK_ALLOW_HTTP_CONNECTIONS) =3D=3D TRUE > > + gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE > > +!endif > > diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc > > index b543caa08fb1..654f73785054 100644 > > --- a/NetworkPkg/NetworkPkg.dsc > > +++ b/NetworkPkg/NetworkPkg.dsc > > @@ -24,6 +24,8 @@ [Defines] > > BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT > > SKUID_IDENTIFIER =3D DEFAULT > > > > +!include NetworkPkg/NetworkDefines.dsc.inc > > + > > [LibraryClasses] > > DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf > > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > > @@ -47,12 +49,8 @@ [LibraryClasses] > > > > DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTabl > > eLib.inf > > SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf > > > > - 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 > > +!include NetworkPkg/NetworkLibs.dsc.inc > > + > > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > @@ -86,6 +84,7 @@ [PcdsFeatureFlag] > > [PcdsFixedAtBuild] > > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2f > > gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000 > > +!include NetworkPkg/NetworkPcds.dsc.inc > > > > > > ########################################################## > > ######################################### > > # > > @@ -107,25 +106,10 @@ [PcdsFixedAtBuild] > > ########################################################## > > ######################################### > > > > [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 > > +!include NetworkPkg/NetworkComponents.dsc.inc > > > > NetworkPkg/Application/IpsecConfig/IpSecConfig.inf > > NetworkPkg/Application/VConfig/VConfig.inf > > > > -[Components.IA32, Components.X64] > > - NetworkPkg/IpSecDxe/IpSecDxe.inf > > - NetworkPkg/IScsiDxe/IScsiDxe.inf > > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > > - NetworkPkg/TlsDxe/TlsDxe.inf > > - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf > > - > > [BuildOptions] > > *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACES > > -- > > 2.19.1.windows.1 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel