From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Mon, 29 Apr 2019 05:04:09 -0700 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A34FF308626C; Mon, 29 Apr 2019 12:03:58 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-121-31.rdu2.redhat.com [10.10.121.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACF39183B2; Mon, 29 Apr 2019 12:03:56 +0000 (UTC) Subject: Re: [edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file To: devel@edk2.groups.io, liming.gao@intel.com References: <20190425123735.10960-1-liming.gao@intel.com> <20190425123735.10960-4-liming.gao@intel.com> From: "Laszlo Ersek" Message-ID: <3846699b-93ea-a6cc-b5e7-64971f28f02d@redhat.com> Date: Mon, 29 Apr 2019 14:03:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190425123735.10960-4-liming.gao@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 29 Apr 2019 12:04:08 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 04/25/19 14:37, Liming Gao wrote: > 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) == TRUE > +[Components.X64] > +!include NetworkPkg/NetworkComponents.dsc.inc > + > +!else > +[Components.IA32, Components.X64, Components.ARM, Components.AARCH6] I'm only commenting on this patch because I had to look up "PLATFORMX64_ENABLE" here, while reviewing "v3 2/3". My observation is that "Components.AARCH6" has a typo -- regardless of semantics (which I'm not attempting to review here), that should be spelled "Components.AARCH64". Thanks Laszlo > +!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/DxeServicesTableLib.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 > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > @@ -103,26 +97,11 @@ > ################################################################################################### > > [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/IpsecConfig/IpSecConfig.inf > NetworkPkg/Application/VConfig/VConfig.inf > > -[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 > > [BuildOptions] > *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES >