Re: [edk2-devel] [PATCH edk2-platforms 07/16] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg's include fragment file.

["Leif Lindholm" <leif.lindholm@linaro.org>]

On Wed, May 15, 2019 at 04:56:52PM +0800, Zhang, Shenglei wrote:
> 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>

> ---
>  Platform/Hisilicon/HiKey960/HiKey960.dsc | 25 ++++++++++--------------
>  Platform/Hisilicon/HiKey960/HiKey960.fdf | 11 +----------
>  2 files changed, 11 insertions(+), 25 deletions(-)
> 
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> index a4a1a371de..f127159138 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc
> @@ -28,6 +28,15 @@
>  
>    DEFINE CONFIG_NO_DEBUGLIB      = TRUE
>  
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_SNP_ENABLE             = FALSE
> +  DEFINE NETWORK_IP6_ENABLE             = FALSE
> +  DEFINE NETWORK_TLS_ENABLE             = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
> +  DEFINE NETWORK_ISCSI_ENABLE           = FALSE
> +  DEFINE NETWORK_VLAN_ENABLE            = FALSE
>  !include Silicon/Hisilicon/Hisilicon.dsc.inc
>  
>  [LibraryClasses.common]
> @@ -54,11 +63,6 @@
>  
>    # Network Libraries
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -
>    # VariableRuntimeDxe Requirements
>    SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
>    AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
> @@ -229,16 +233,7 @@
>    #
>    # UEFI Network Stack
>    #
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -  NetworkPkg/TcpDxe/TcpDxe.inf
> -
> +!include NetworkPkg/Network.dsc.inc
>    #
>    # FAT filesystem + GPT/MBR partitioning
>    #
> diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> index 1b07284dc8..def66d41d4 100644
> --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf
> +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf
> @@ -153,16 +153,7 @@ READ_LOCK_STATUS   = TRUE
>    #
>    # UEFI Network Stack
>    #
> -  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -  INF NetworkPkg/TcpDxe/TcpDxe.inf
> -
> +!include NetworkPkg/Network.fdf.inc
>    #
>    # FAT filesystem + GPT/MBR partitioning
>    #
> -- 
> 2.18.0.windows.1
> 
> 
> 
>