Nt32Pkg: Update DSC/FDF to use NetworkPkg's include fragment file.

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.
The feature enabling flags in [Defines] section have be updated to use the
NetworkPkg's terms, and the value have been overridden with the original
default value on this platform.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Message-Id: <20190516081810.27840-3-shenglei.zhang@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1293
[lersek@redhat.com: add TianoCore Bugzilla reference]

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 71079f098e44ed059a26143597a4afe64314e06d..990d5ee0bf1ea2fab84ceaba16b809cbafb37652 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -43,34 +43,15 @@
   #       located in CryptoPkg\Library\OpensslLib to enable the OpenSSL building first.\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  \r
-  #\r
-  # This flag is to enable or disable TLS feature.  \r
-  # These can be changed on the command line.\r
-  # -D FLAG=VALUE\r
-  #\r
-  # Note: TLS feature highly depends on the OpenSSL building. To enable this \r
-  #       feature, please follow the instructions found in the file "Patch-HOWTO.txt" \r
-  #       located in CryptoPkg\Library\OpensslLib to enable the OpenSSL building first.\r
-  #\r
-  DEFINE TLS_ENABLE = FALSE\r
-  \r
-  #\r
-  # Indicates whether HTTP connections (i.e., unsecured) are permitted or not.\r
-  # -D FLAG=VALUE\r
-  #\r
-  # Note: If ALLOW_HTTP_CONNECTIONS is TRUE, HTTP connections are allowed. Both \r
-  #       the "https://" and "http://" URI schemes are permitted. Otherwise, HTTP \r
-  #       connections are denied. Only the "https://" URI scheme is permitted.\r
-  #\r
-  DEFINE ALLOW_HTTP_CONNECTIONS = TRUE\r
 \r
   #\r
-  # This flag is to enable or disable IPv6 network stack.\r
-  # These can be changed on the command line.\r
-  # -D FLAG=VALUE\r
+  # Network definition\r
+  # SnpNt32Dxe.inf will be used.\r
   #\r
-  DEFINE NETWORK_IP6_ENABLE = FALSE\r
+  DEFINE NETWORK_TLS_ENABLE             = FALSE\r
+  DEFINE NETWORK_IP6_ENABLE             = FALSE\r
+  DEFINE NETWORK_SNP_ENABLE             = FALSE\r
+  DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
 \r
 ################################################################################\r
 #\r
@@ -133,12 +114,6 @@
   #\r
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.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
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r
   GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf\r
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
@@ -162,7 +137,7 @@
   LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   ResetSystemLib|Nt32Pkg/Library/ResetSystemLib/ResetSystemLib.inf\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
 !else\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
@@ -270,11 +245,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
 \r
-!if $(ALLOW_HTTP_CONNECTIONS) == TRUE\r
-  gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
-\r
-\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot\r
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04\r
@@ -448,39 +418,11 @@
   MdeModulePkg/Application/HelloWorld/HelloWorld.inf\r
 \r
   #\r
-  # Network stack drivers\r
+  # Network SNP drivers\r
   # To test network drivers, need network Io driver(SnpNt32Io.dll), please refer to NETWORK-IO Subproject.\r
   #\r
-  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
+!include NetworkPkg/Network.dsc.inc\r
   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
-\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-\r
-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-  NetworkPkg/DnsDxe/DnsDxe.inf\r
-  NetworkPkg/HttpDxe/HttpDxe.inf\r
-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-   \r
-!if $(TLS_ENABLE) == TRUE\r
-  NetworkPkg/TlsDxe/TlsDxe.inf\r
-  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
-!endif\r
-\r
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
   MdeModulePkg/Application/UiApp/UiApp.inf{\r
     <LibraryClasses>\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 3a3e8fae23b30f03d497e05ec11327613917c8fb..7798d1792304e26c70c9e873b945ffd41589020e 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -243,32 +243,9 @@ INF  Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystemDxe.inf
 INF  MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf\r
 INF  MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf\r
 \r
-INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
 INF  Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
-INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
-INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
-INF  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
-INF  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
-!endif\r
-INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
-INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
-INF  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
-!if $(TLS_ENABLE) == TRUE\r
-INF  NetworkPkg/TlsDxe/TlsDxe.inf\r
-INF  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
-!endif\r
+!include NetworkPkg/Network.fdf.inc\r
+\r
 INF  MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf\r
 ################################################################################\r
 #\r