1. Patchew
  2. EDK2
  3. [edk2-devel] [Patch v3 0/3] Add package level include DSC/FDF in NetworkPkg
  4. View patch

[edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file

Liming Gao posted 3 patches 6 years, 9 months ago
There is a newer version of this series
[edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file
Posted by Liming Gao 6 years, 9 months ago 
Platform DSC can include Network.dsc.inc to enable network features.

Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 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.<BR>
+#
+#    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]
+!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
-- 
2.13.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file
Posted by Laszlo Ersek 6 years, 9 months ago 
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 <liming.gao@intel.com>
> ---
>  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.<BR>
> +#
> +#    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
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#39759): https://edk2.groups.io/g/devel/message/39759
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]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file
Posted by Liming Gao 6 years, 9 months ago 
> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Laszlo Ersek
> Sent: Monday, April 29, 2019 8:04 PM
> To: devel@edk2.groups.io; Gao, Liming <liming.gao@intel.com>
> Subject: Re: [edk2-devel] [Patch v3 3/3] NetworkPkg: Add package level include DSC file
> 
> 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 <liming.gao@intel.com>
> > ---
> >  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.<BR>
> > +#
> > +#    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".
I will move PLATFORMX64_ENABLE flag in Network.dsc.inc [Defines] sections. 
So, NetworkDefines.dsc.inc can be clean. 
> 
> 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 for catch it. I will correct it in next version patch. 
> 
> 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
> >
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#39775): https://edk2.groups.io/g/devel/message/39775
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]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.