Nt32Pkg: Add build flag to enable or disable IPv6 network stack.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 499b1fe8abe0e8b3c75ec1bf8e3f0a247cb62a88..8927dcd12566b9f1707ea1d426184732f35e5890 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -71,6 +71,13 @@
   #\r
   DEFINE ALLOW_HTTP_CONNECTIONS = TRUE\r
 \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
+  #\r
+  DEFINE NETWORK_IP6_ENABLE = FALSE\r
+\r

 ################################################################################\r
 #\r
 # SKU Identification section - list of all SKU IDs supported by this\r
 ################################################################################\r
 #\r
 # SKU Identification section - list of all SKU IDs supported by this\r


@@ -135,6 +142,7 @@
   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
   IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
   UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.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
   HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r


@@ -462,12 +470,22 @@
   MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
   MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
   MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.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/Tcp4Dxe/Tcp4Dxe.inf\r

   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r

-  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r

   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 \r
   Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 \r

+!if $(NETWORK_IP6_ENABLE) == TRUE\r
+  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
+  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
+  NetworkPkg/TcpDxe/TcpDxe.inf\r
+  NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
+  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
+!else\r
+  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
+  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r

   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
   MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r

+!endif\r

 \r
   NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
   NetworkPkg/DnsDxe/DnsDxe.inf\r
 \r
   NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
   NetworkPkg/DnsDxe/DnsDxe.inf\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index bbb4cccb34681568e182ebef87e91c76e7300540..282e59c7f1ddf89274f10c83f2ebb0f1fcfa0a5e 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -256,11 +256,21 @@ INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
 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/MnpDxe/MnpDxe.inf\r
 INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
 INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r

-INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r

 INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
 INF  Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf\r
 INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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
+INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
+INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
+!else\r
+INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r

 INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
 INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
 INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
 INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r

+!endif\r

 INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
 INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
 INF  NetworkPkg/HttpDxe/HttpDxe.inf\r
 INF  NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
 INF  NetworkPkg/DnsDxe/DnsDxe.inf\r
 INF  NetworkPkg/HttpDxe/HttpDxe.inf\r