From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=KPwYRiml; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by groups.io with SMTP; Thu, 23 May 2019 10:00:45 -0700 Received: by mail-wm1-f67.google.com with SMTP id f204so6619784wme.0 for ; Thu, 23 May 2019 10:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=kKO4zMNiF9O0kcLs3iggjLh69Q0+6pmILru2j/vjEYU=; b=KPwYRimlBR3uwv9MsjZesZ/z+pAEWKAB9CQ/EeRzU9mh0SHhM2n/uAqBSKLLugeHtL cDlvEvU8j/5x/HnY+1Ha0H6U38jKt6Rz/KnPc5pZicd3be6jw1SZwsBezkCWOh54i27h XiMwmZLne/hgbEwbiYFm/YRo5wLeBVQnjt1RzSRrNTROwzN0ZxDwbmNdnrnpAN47rbMs 1t2UMuIMCNjAioMrFlEGRPiwLmLmV0nwizpLbaCTH7fh4d9SA2JWl9oVHDdcOMbw9igv nMjk6ZJix+baiNlgpbipErW8gy0uqF+D/YKTneSvVHF3MF2jzCj3qYHMhvUl0fGPg+mZ C8cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=kKO4zMNiF9O0kcLs3iggjLh69Q0+6pmILru2j/vjEYU=; b=s8O8uUw6Bct7u/02sk0g5RIHQQvcoBvc2QxJjiCgqc4Mi7yzUB+HoRlgAcw4NYxHpC yq89iokGYWC0KNOnhfVpwc3V6EAEmTiUIFwxHfQQx7vo63KE5SlY1Lx+F/Z7SyJdSLUw c5N8JjRnEZbBV1+sZNu2grMZgWuesd7xIcmleBz5z/s8mnLHR1/Y9cjJcit/hQ89lDZK r1JTiwuSv3kO8BSf60yD2cRgHlmaq2d2K+KdSZ/Cny4h+ZpFRwV6iuZn5KsD7SRvc1Qt kG+uKoxGhqSen4cKt7/h1ENLxi4XesoMwsbXrvX2lT7kF+wJyFnY+oXZIniXVOq9lr52 yloQ== X-Gm-Message-State: APjAAAW/DENu7XzKUvt0cPGt977QM1PfMtLlo+JUoqc5ipakVr8u/lYc /Lj5Cz1t41HY9k9FBxyWfDb4kQ== X-Google-Smtp-Source: APXvYqxMdGYVgiUmGwAeDWfmqLJ+4RmP70v2lyZp1faHfe/HNNKBjz/Fv/GW9TWL4IHoPFTtHDIJlg== X-Received: by 2002:a1c:a846:: with SMTP id r67mr12389873wme.24.1558630843919; Thu, 23 May 2019 10:00:43 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id c18sm26891083wrm.7.2019.05.23.10.00.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 May 2019 10:00:42 -0700 (PDT) Date: Thu, 23 May 2019 18:00:41 +0100 From: "Leif Lindholm" To: Liming Gao Cc: devel@edk2.groups.io, Shenglei Zhang Subject: Re: [Patch edk2-platform V4 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF Message-ID: <20190523170041.zf6w7j6txlx6hx5p@bivouac.eciton.net> References: <20190521133623.20404-1-liming.gao@intel.com> <20190521133623.20404-13-liming.gao@intel.com> MIME-Version: 1.0 In-Reply-To: <20190521133623.20404-13-liming.gao@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, May 21, 2019 at 09:36:17PM +0800, Liming Gao wrote: > From: Shenglei Zhang > > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg. > > Cc: Leif Lindholm > Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm > --- > Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++ > Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++ > Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++ > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +----------------- > Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +----------- > 5 files changed, 26 insertions(+), 28 deletions(-) > > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc > index 01532b4a00..8ee84902ef 100644 > --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc > +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc > @@ -46,6 +46,14 @@ > FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc > > + # > + # Network definition > + # > + DEFINE NETWORK_IP6_ENABLE = FALSE > + DEFINE NETWORK_TLS_ENABLE = FALSE > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > + DEFINE NETWORK_ISCSI_ENABLE = FALSE > + > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > [LibraryClasses.common] > diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc > index c6510bbbbd..5418ddcaa7 100644 > --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc > +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc > @@ -46,6 +46,14 @@ > FLASH_DEFINITION = Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > BOARD_DXE_FV_COMPONENTS = Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc > > + # > + # Network definition > + # > + DEFINE NETWORK_IP6_ENABLE = FALSE > + DEFINE NETWORK_TLS_ENABLE = FALSE > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > + DEFINE NETWORK_ISCSI_ENABLE = FALSE > + > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > [LibraryClasses.common] > diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc > index d08013612f..ff9bd5dc8c 100644 > --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc > +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc > @@ -47,6 +47,14 @@ > BOARD_DXE_FV_COMPONENTS = Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.fdf.inc > CAPSULE_ENABLE = TRUE > > + # > + # Network definition > + # > + DEFINE NETWORK_IP6_ENABLE = FALSE > + DEFINE NETWORK_TLS_ENABLE = FALSE > + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > + DEFINE NETWORK_ISCSI_ENABLE = FALSE > + > !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > [LibraryClasses.common] > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > index 0cf5d8447a..cfbc172b4f 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 > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > index d2bbdedcfa..6face86577 100644 > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf > @@ -129,17 +129,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.13.0.windows.1 >