[edk2-devel] [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include fragment file.

[Leif Lindholm]

On Wed, May 15, 2019 at 04:56:57PM +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 at intel.com>
> ---
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 26 +++++++------------
>  Silicon/Marvell/Armada7k8k/Armada7k8k.fdf     | 12 +--------
>  2 files changed, 10 insertions(+), 28 deletions(-)
> 
> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> index 0cf5d8447a..cff00fca50 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
> @@ -115,12 +115,6 @@
>    RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/RealTimeClockLib.inf
>    ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
>  
> -  # Network support
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> -  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> -  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> -  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> -
>    # These libraries are used by the dynamic EFI Shell commands
>    ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> @@ -471,17 +465,7 @@
>    Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf
>  
>    # Network support
> -  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> -  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> -  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> -  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> -  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -  NetworkPkg/TcpDxe/TcpDxe.inf
> +!include NetworkPkg/Network.dsc.inc
>    Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
>    Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
>    Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
> @@ -692,3 +676,11 @@
>    DEFINE UTMI_USB_HOST0     = 0x0
>    DEFINE UTMI_USB_HOST1     = 0x1
>    DEFINE UTMI_USB_DEVICE0   = 0x2
> +
> +  #
> +  # Network definition
> +  #
> +  DEFINE NETWORK_IP6_ENABLE             = FALSE
> +  DEFINE NETWORK_TLS_ENABLE             = FALSE
> +  DEFINE NETWORK_HTTP_BOOT_ENABLE       = FALSE
> +  DEFINE NETWORK_ISCSI_ENABLE           = FALSE

These should be set in the [Defines] section of each platform that
includes this file:

Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc
Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc
Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc

(I see no problem with that being done in a single patch, and updated
version of this one. These are different platforms based on the same
silicon.)

/
    Leif

> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> index 8a050ef987..01a5ea3bed 100644
> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
> @@ -135,17 +135,7 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>    INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
>  
>    # Network support
> -  INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
> -  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> -  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> -  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/Mtftp4Dxe/Mtftp4Dxe.inf
> -  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> -  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> -  INF NetworkPkg/TcpDxe/TcpDxe.inf
> +!include NetworkPkg/Network.fdf.inc
>    INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf
>    INF Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf
>    INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf
> -- 
> 2.18.0.windows.1
> 
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40834): https://edk2.groups.io/g/devel/message/40834
Mute This Topic: https://groups.io/mt/31627863/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-