Re: [edk2-devel] [PATCH 4/4] EmulatorPkg: Update DSC/FDF to use NetworkPkg's include fragment file.

["Ni, Ray" <ray.ni@intel.com>]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Zhang, Shenglei
> Sent: Tuesday, May 14, 2019 3:40 PM
> To: devel@edk2.groups.io
> Cc: Justen, Jordan L <jordan.l.justen@intel.com>; Andrew Fish
> <afish@apple.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [edk2-devel] [PATCH 4/4] EmulatorPkg: 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 been updated to use the
> NetworkPkg's terms, and the value has been overridden with the original
> default value on this platform.
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  EmulatorPkg/EmulatorPkg.dsc | 32 +++++++++++++++-----------------
> EmulatorPkg/EmulatorPkg.fdf | 10 +---------
>  2 files changed, 16 insertions(+), 26 deletions(-)
> 
> diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
> index de20f81046..f63e7166a4 100644
> --- a/EmulatorPkg/EmulatorPkg.dsc
> +++ b/EmulatorPkg/EmulatorPkg.dsc
> @@ -23,6 +23,19 @@
>    SKUID_IDENTIFIER               = DEFAULT
>    FLASH_DEFINITION               = EmulatorPkg/EmulatorPkg.fdf
> 
> +  #
> +  # Network stack drivers
> +  #
> +
> +  #
> +  # EmuSnpDxe.inf will be used.
> +  #
> +  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
> +
>  [SkuIds]
>    0|DEFAULT
> 
> @@ -68,10 +81,6 @@
>    # Generic Modules
>    #
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> 
> OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNu
> ll/OemHookStatusCodeLibNull.inf
>    BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
>    FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
> @@ -357,19 +366,6 @@
> 
>    MdeModulePkg/Application/HelloWorld/HelloWorld.inf
> 
> -  #
> -  # Network stack drivers
> -  #
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  NetworkPkg/TcpDxe/TcpDxe.inf
> -
>    MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>    MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
>    MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> @@ -412,6 +408,8 @@
> 
>  !endif
> 
> +!include NetworkPkg/Network.dsc.inc
> +
>  [BuildOptions]
>    MSFT:DEBUG_*_*_CC_FLAGS = /Od /Oy-
>    MSFT:NOOPT_*_*_CC_FLAGS = /Od /Oy-
> diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
> index 94a060c999..ec411e82b4 100644
> --- a/EmulatorPkg/EmulatorPkg.fdf
> +++ b/EmulatorPkg/EmulatorPkg.fdf
> @@ -190,15 +190,7 @@ INF
> MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
>  !if $(NETWORK_SUPPORT)
>  INF  EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf
>  !endif
> -INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -INF  NetworkPkg/TcpDxe/TcpDxe.inf
> -INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> +!include NetworkPkg/Network.fdf.inc
> 
>  INF FatPkg/EnhancedFatDxe/Fat.inf
> 
> --
> 2.18.0.windows.1
> 
> 
>