[edk2,RFC,1/6] ConfigPkg: add new package for holding common config fragments

Message ID 20170920172755.22767-2-leif.lindholm@linaro.org
State New
Headers show
Series
  • Create central repository for boilerplate configuration
Related show

Commit Message

Leif Lindholm Sept. 20, 2017, 5:27 p.m.
Start with common networking options.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 ConfigPkg/Network/Network.dsc.inc | 92 +++++++++++++++++++++++++++++++++++++++
 ConfigPkg/Network/Network.fdf.inc | 47 ++++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 ConfigPkg/Network/Network.dsc.inc
 create mode 100644 ConfigPkg/Network/Network.fdf.inc

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Sept. 21, 2017, 12:05 a.m. | #1
On 20 September 2017 at 10:27, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Start with common networking options.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---

>  ConfigPkg/Network/Network.dsc.inc | 92 +++++++++++++++++++++++++++++++++++++++

>  ConfigPkg/Network/Network.fdf.inc | 47 ++++++++++++++++++++

>  2 files changed, 139 insertions(+)

>  create mode 100644 ConfigPkg/Network/Network.dsc.inc

>  create mode 100644 ConfigPkg/Network/Network.fdf.inc

>

> diff --git a/ConfigPkg/Network/Network.dsc.inc b/ConfigPkg/Network/Network.dsc.inc

> new file mode 100644

> index 0000000000..8c53350deb

> --- /dev/null

> +++ b/ConfigPkg/Network/Network.dsc.inc

> @@ -0,0 +1,92 @@

> +## @file

> +#

> +# Copyright (c) 2017, Linaro ltd. All rights reserved.<BR>

> +#

> +#  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.

> +#

> +##

> +

> +

> +################################################################################

> +#

> +# Library Class section

> +#

> +################################################################################

> +[LibraryClasses]

> +  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

> +  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

> +  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

> +  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

> +


Now that you have made a clean spot: any reason we shouldn't do

DpcLib           |MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
IpIoLib          |MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
NetLib           |MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
UdpIoLib         |MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

?

> +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE

> +  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

> +!endif

> +

> +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE

> +  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

> +  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

> +  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

> +!endif

> +

> +!if $(CONFIG_TLS_ENABLE) == TRUE

> +  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf

> +  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf

> +!else

> +  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf

> +!endif

> +

> +

> +#################################################################################

> +# Pcd Section

> +#

> +################################################################################

> +[PcdsFixedAtBuild]

> +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE

> +  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE

> +!endif

> +

> +

> +################################################################################

> +#

> +# Components Section

> +#

> +################################################################################

> +[Components]

> +  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

> +  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

> +  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

> +  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

> +  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

> +  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

> +  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

> +  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

> +  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

> +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE

> +  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

> +  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

> +  NetworkPkg/IScsiDxe/IScsiDxe.inf

> +  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

> +  NetworkPkg/TcpDxe/TcpDxe.inf

> +  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

> +  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

> +!else

> +  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

> +  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

> +  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

> +!endif

> +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE

> +  NetworkPkg/DnsDxe/DnsDxe.inf

> +  NetworkPkg/HttpBootDxe/HttpBootDxe.inf

> +  NetworkPkg/HttpDxe/HttpDxe.inf

> +  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

> +!endif

> +!if $(CONFIG_TLS_ENABLE) == TRUE

> +  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf

> +  NetworkPkg/TlsDxe/TlsDxe.inf

> +!endif

> diff --git a/ConfigPkg/Network/Network.fdf.inc b/ConfigPkg/Network/Network.fdf.inc

> new file mode 100644

> index 0000000000..614fd18a9a

> --- /dev/null

> +++ b/ConfigPkg/Network/Network.fdf.inc

> @@ -0,0 +1,47 @@

> +## @file

> +#

> +# Copyright (c) 2017, Linaro ltd. All rights reserved.<BR>

> +#

> +#  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.

> +#

> +##

> +

> +

> +  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

> +  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

> +  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

> +  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

> +  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

> +  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

> +  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

> +  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

> +  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

> +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE

> +  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

> +  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

> +  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf

> +  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

> +  INF  NetworkPkg/TcpDxe/TcpDxe.inf

> +  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

> +  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

> +!else

> +  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

> +  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

> +  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

> +!endif

> +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE

> +  INF  NetworkPkg/DnsDxe/DnsDxe.inf

> +  INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf

> +  INF  NetworkPkg/HttpDxe/HttpDxe.inf

> +  INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

> +!endif

> +!if $(CONFIG_TLS_ENABLE) == TRUE

> +  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf

> +  INF  NetworkPkg/TlsDxe/TlsDxe.inf

> +!endif

> --

> 2.11.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Laszlo Ersek Sept. 22, 2017, 11:22 a.m. | #2
On 09/21/17 02:05, Ard Biesheuvel wrote:
> On 20 September 2017 at 10:27, Leif Lindholm <leif.lindholm@linaro.org> wrote:

>> Start with common networking options.

>>

>> Contributed-under: TianoCore Contribution Agreement 1.1

>> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

>> ---

>>  ConfigPkg/Network/Network.dsc.inc | 92 +++++++++++++++++++++++++++++++++++++++

>>  ConfigPkg/Network/Network.fdf.inc | 47 ++++++++++++++++++++

>>  2 files changed, 139 insertions(+)

>>  create mode 100644 ConfigPkg/Network/Network.dsc.inc

>>  create mode 100644 ConfigPkg/Network/Network.fdf.inc

>>

>> diff --git a/ConfigPkg/Network/Network.dsc.inc b/ConfigPkg/Network/Network.dsc.inc

>> new file mode 100644

>> index 0000000000..8c53350deb

>> --- /dev/null

>> +++ b/ConfigPkg/Network/Network.dsc.inc

>> @@ -0,0 +1,92 @@

>> +## @file

>> +#

>> +# Copyright (c) 2017, Linaro ltd. All rights reserved.<BR>

>> +#

>> +#  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.

>> +#

>> +##

>> +

>> +

>> +################################################################################

>> +#

>> +# Library Class section

>> +#

>> +################################################################################

>> +[LibraryClasses]

>> +  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

>> +  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

>> +  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

>> +  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

>> +

> 

> Now that you have made a clean spot: any reason we shouldn't do

> 

> DpcLib           |MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

> IpIoLib          |MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf

> NetLib           |MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

> UdpIoLib         |MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf

> 

> ?


Do you mean the nicer visual layout / alignment?

Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/ConfigPkg/Network/Network.dsc.inc b/ConfigPkg/Network/Network.dsc.inc
new file mode 100644
index 0000000000..8c53350deb
--- /dev/null
+++ b/ConfigPkg/Network/Network.dsc.inc
@@ -0,0 +1,92 @@ 
+## @file
+#
+# Copyright (c) 2017, Linaro ltd. All rights reserved.<BR>
+#
+#  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.
+#
+##
+
+
+################################################################################
+#
+# Library Class section
+#
+################################################################################
+[LibraryClasses]
+  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+
+!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE
+  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
+!endif
+
+!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE
+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+!endif
+
+!if $(CONFIG_TLS_ENABLE) == TRUE
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
+!else
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+!endif
+
+
+#################################################################################
+# Pcd Section
+#
+################################################################################
+[PcdsFixedAtBuild]
+!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE
+  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
+!endif
+
+
+################################################################################
+#
+# Components Section
+#
+################################################################################
+[Components]
+  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE
+  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
+  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+  NetworkPkg/IScsiDxe/IScsiDxe.inf
+  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
+  NetworkPkg/TcpDxe/TcpDxe.inf
+  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+!else
+  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+!endif
+!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE
+  NetworkPkg/DnsDxe/DnsDxe.inf
+  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+  NetworkPkg/HttpDxe/HttpDxe.inf
+  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+!endif
+!if $(CONFIG_TLS_ENABLE) == TRUE
+  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+  NetworkPkg/TlsDxe/TlsDxe.inf
+!endif
diff --git a/ConfigPkg/Network/Network.fdf.inc b/ConfigPkg/Network/Network.fdf.inc
new file mode 100644
index 0000000000..614fd18a9a
--- /dev/null
+++ b/ConfigPkg/Network/Network.fdf.inc
@@ -0,0 +1,47 @@ 
+## @file
+#
+# Copyright (c) 2017, Linaro ltd. All rights reserved.<BR>
+#
+#  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.
+#
+##
+
+
+  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE
+  INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
+  INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf
+  INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
+  INF  NetworkPkg/TcpDxe/TcpDxe.inf
+  INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf
+  INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
+!else
+  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+!endif
+!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE
+  INF  NetworkPkg/DnsDxe/DnsDxe.inf
+  INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+  INF  NetworkPkg/HttpDxe/HttpDxe.inf
+  INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+!endif
+!if $(CONFIG_TLS_ENABLE) == TRUE
+  INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf
+  INF  NetworkPkg/TlsDxe/TlsDxe.inf
+!endif