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=NYFfGDLu; spf=pass (domain: linaro.org, ip: 209.85.128.68, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by groups.io with SMTP; Tue, 21 May 2019 05:04:06 -0700 Received: by mail-wm1-f68.google.com with SMTP id y3so2719925wmm.2 for ; Tue, 21 May 2019 05:04:06 -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=dMlJzBLQ3hioim3PHYH+tF179NLizBpD1bPy0EufbUA=; b=NYFfGDLuPQjov+TCOB6Bp5gVDesAmqWrbZ9+tppYIz92vocqM7kZNZWCou17nw3n1a WrJDonsPbFNA1jtLSN8jxeMGtfbtUO9KispZHZOaL8LCLMemFwvo3VrzSe9wXJpkxzhJ OM1Wifd8LOqk9qf7MpAWAVlK51YcQuA4UBxu0RxBtaQUAc7Vsp/6i3lhR4mGzFkyHU0w ADeOqeQcIE7YbGSFcaEHgv16RWHwD+KrMjtksXWxDnqDIy0eYpdSi80QvKJFuC03Zbak ZgFlnA0VjHqJPO3lNIlj9hps2YVjjJwLXQyE5YdgQ+4py89rmaBTwxbLhUnhTsC9TUfq f89w== 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=dMlJzBLQ3hioim3PHYH+tF179NLizBpD1bPy0EufbUA=; b=qRHWXELnOdZmtlll26kOpN/nnLGXradtyh4pFm4JGmhkmrHdJgfn5fhBTDQu7qWYRA IoApuKjS2wf0JLOGxl3BaUNRX3enNW971rYvOwaJFkLQz6qrEFAaCRXVBniQZSN/lRDU R39NR4qjm49dIXggCZCPyI0rctZixT5WNrGjJqkZkg1wabd3RnnWHaE2ZSValicLGIU2 HZpgHodupjOTH21suweEWmcHf6ZUU2by8eMAKAypDdlZu8uTSl+DLG4m/ntaULwFyyfh juG2Eiwh+eCYIapR22ViWNgWbFNxsircqwekxdgM9ReArOwKt+OuC4HTLHE/zNM1zcwE oTaQ== X-Gm-Message-State: APjAAAWZ7AnWZxq9g4i1zBqm4N1II+OwXeKbOLeZiWAwF1a5qTGqrF0R Jd6X1xrZqtharnnjC6qEigxeKg== X-Google-Smtp-Source: APXvYqwQfQb/5IdnQ/F3Ad7pNzMN2oyuaOnx9zfgeILxQIk2ayvgw0FpmgnTHOUtE4aM/XNuWaspKg== X-Received: by 2002:a1c:800f:: with SMTP id b15mr3329910wmd.46.1558440245010; Tue, 21 May 2019 05:04:05 -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 b10sm49612573wrh.59.2019.05.21.05.04.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2019 05:04:03 -0700 (PDT) Date: Tue, 21 May 2019 13:04:02 +0100 From: "Leif Lindholm" To: Shenglei Zhang Cc: devel@edk2.groups.io Subject: Re: [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF Message-ID: <20190521120402.gl4shzs7lbqffxdr@bivouac.eciton.net> References: <20190520070729.30812-1-shenglei.zhang@intel.com> <20190520070729.30812-13-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190520070729.30812-13-shenglei.zhang@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, May 20, 2019 at 03:07:23PM +0800, Shenglei Zhang wrote: > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg. > > v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc, > Armada80x0Db.dsc and Armada80x0McBin.dsc. Version comments go below "---" line. > Cc: Leif Lindholm > Signed-off-by: Shenglei Zhang > --- > Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++ > Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++ > .../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++ Please follow https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers when generating and submitting patches. That way we get to see the whole path of the files being modified. / Leif > 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.18.0.windows.1 >