Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF

This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

2 files changed, 11 insertions, 58 deletions

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 5387daf5..269515c7 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -22,8 +22,14 @@
   BUILD_TARGETS                  = DEBUG|NOOPT|RELEASE

   SKUID_IDENTIFIER               = DEFAULT

   FLASH_DEFINITION               = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf

-  DEFINE NETWORK_IP6_ENABLE      = FALSE

-  DEFINE HTTP_BOOT_ENABLE        = FALSE

+

+  #

+  # Network definition

+  #

+  DEFINE NETWORK_TLS_ENABLE      = FALSE

+  DEFINE NETWORK_VLAN_ENABLE     = FALSE

+  DEFINE NETWORK_IP6_ENABLE             = FALSE

+  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE

 

 !include Silicon/Hisilicon/Hisilicon.dsc.inc

 

@@ -36,12 +42,8 @@
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

   IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf

 

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

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

   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

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

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

   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf

   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf

@@ -49,9 +51,8 @@
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

 

-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf

 

-!if $(HTTP_BOOT_ENABLE) == TRUE

+!if $(NETWORK_HTTP_BOOT_ENABLE) == TRUE

   HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf

 !endif

 

@@ -340,30 +341,7 @@
   #

   #network

   #

-  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

-

-  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/Udp4Dxe/Udp4Dxe.inf

-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  NetworkPkg/TcpDxe/TcpDxe.inf

-  NetworkPkg/IScsiDxe/IScsiDxe.inf

-!if $(NETWORK_IP6_ENABLE) == TRUE

-  NetworkPkg/Ip6Dxe/Ip6Dxe.inf

-  NetworkPkg/Udp6Dxe/Udp6Dxe.inf

-  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

-  NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

-!endif

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  NetworkPkg/DnsDxe/DnsDxe.inf

-  NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

-  NetworkPkg/HttpDxe/HttpDxe.inf

-  NetworkPkg/HttpBootDxe/HttpBootDxe.inf

-!endif

+!include NetworkPkg/Network.dsc.inc

 

   MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf

   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf

diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf
index 976b5976..f6cb3f68 100644
--- a/Platform/Hisilicon/D06/D06.fdf
+++ b/Platform/Hisilicon/D06/D06.fdf
@@ -239,32 +239,7 @@ READ_LOCK_STATUS   = TRUE
   #

   #Network

   #

-  INF Platform/Hisilicon/D06/Drivers/Net/SnpHi1620NewDxe/SnpDxe.inf

-

-  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

-  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/Udp4Dxe/Udp4Dxe.inf

-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF NetworkPkg/TcpDxe/TcpDxe.inf

-  INF NetworkPkg/IScsiDxe/IScsiDxe.inf

-!if $(NETWORK_IP6_ENABLE) == TRUE

-  INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf

-  INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf

-  INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf

-  INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf

-!endif

-!if $(HTTP_BOOT_ENABLE) == TRUE

-  INF NetworkPkg/DnsDxe/DnsDxe.inf

-  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf

-  INF NetworkPkg/HttpDxe/HttpDxe.inf

-  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf

-!endif

-

+!include NetworkPkg/Network.fdf.inc

 

   #

   # PCI Support