NetworkPkg: Add package level include DSC file

Platform DSC can include Network.dsc.inc to enable network features.

Signed-off-by: Liming Gao <liming.gao@intel.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>

diff --git a/NetworkPkg/Network.dsc.inc b/NetworkPkg/Network.dsc.inc
new file mode 100644 (file)
index 0000000..c7f4328
--- /dev/null
+++ b/NetworkPkg/Network.dsc.inc
@@ -0,0 +1,40 @@
+## @file\r
+# Network DSC include file for Platform DSC\r
+#\r
+# This file includes all required information to enable Network features.\r
+# It can be included to a platform DSC file by using "!include NetworkPkg/Network.dsc.inc".\r
+#\r
+# This file defines one build flag PLATFORMX64_ENABLE to support\r
+# IA32 PEI and X64 DXE platform. Its default value is FALSE.\r
+#\r
+# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>\r
+#\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
+#\r
+##\r
+\r
+[Defines]\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
+\r
+!ifndef PLATFORMX64_ENABLE\r
+  #\r
+  # PLATFORMX64_ENABLE is set to TRUE when PEI is IA32 and DXE is X64 platform\r
+  #\r
+  DEFINE PLATFORMX64_ENABLE = FALSE\r
+!endif\r
+\r
+[PcdsFixedAtBuild]\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
+\r
+[LibraryClasses]\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
+\r
+!if $(PLATFORMX64_ENABLE) == TRUE\r
+[Components.X64]\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+!else\r
+[Components.IA32, Components.X64, Components.ARM, Components.AARCH64]\r
+!include NetworkPkg/NetworkComponents.dsc.inc\r
+\r
+!endif\r

diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc
index be9d9248e4d7051eb5f8b2abee5fab962dc9b3ad..fe2fcf7b3c380cdb96db2c11d5e00b107a0b6be0 100644 (file)
--- a/NetworkPkg/NetworkPkg.dsc
+++ b/NetworkPkg/NetworkPkg.dsc
@@ -41,12 +41,6 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
 \r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
 \r

-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
-  HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r


@@ -103,24 +97,10 @@
 ###################################################################################################\r
 \r
 [Components]\r
 ###################################################################################################\r
 \r
 [Components]\r

-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r

   NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf\r
   NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf\r

-\r

   NetworkPkg/Application/VConfig/VConfig.inf\r
 \r
   NetworkPkg/Application/VConfig/VConfig.inf\r
 \r

-[Components.IA32, Components.X64, Components.ARM, Components.AARCH64]\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/TlsDxe/TlsDxe.inf\r
-  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
+  !include NetworkPkg/Network.dsc.inc\r

 \r
 [BuildOptions]\r
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
 \r
 [BuildOptions]\r
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r