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=UvUIA/V7; spf=pass (domain: linaro.org, ip: 209.85.221.67, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by groups.io with SMTP; Thu, 16 May 2019 13:18:19 -0700 Received: by mail-wr1-f67.google.com with SMTP id r7so4704532wrr.13 for ; Thu, 16 May 2019 13:18:18 -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=jNPp6nAxdUeHDTT8rjFNqonFJnj10wvn+NIH0JB+ZFM=; b=UvUIA/V7rC4W/1mcCopTN2l3RL7lOc3cjf78gpZALQpBZaoGVa+i2s2+XeuwWtHJ0B +zISLccijjYGnED1AtGAxnfWVpQrKX0tOzyxQVqNWbK7GGeu8PoYSy3gpxRwN2vigt3M b27GyGTF7fXBOvb0D8BFEE1UXRn7YjvcG2uN/83Uz82nBAf2UNaGTj9rma3iCY+i+qnl fNfxnLmEWKnFcOnmqq4ICDGUcvUj2waslJCmzidiqV2+IKM/lLzdBJPzqthrHYLgK4FS ZfLqrotpDBmlxQ+wNRXxjhyxUSBov9AUQRUyIQV5fqGWCJGF122KvcZ9Z1QVluAiu93z KFHA== 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=jNPp6nAxdUeHDTT8rjFNqonFJnj10wvn+NIH0JB+ZFM=; b=aq1ul91xDkWy8DQu+HJod8EAABu0HSY3Uj3YU3qHH7j4TkGhhiRgjC53MP+81YXNOz +JWKFTYq1mSqPB2G42vSjI0QDgsJsXxM4q8Z2FHWpsePPcVINwxivs/1hmYkzddKdiUe r6YG/RvkWby3hGg9oD+qOLfsvNBDU4MaqYzyHXP5g1DRdA2TsTbReFm5SjzV9yEQ9JPg dtmznGU78lmpgl51rbYyr/voSl+0wrTJ3vB2mFgqH1AIRRwV6+TZYAzRxXcjGUGmBFr8 K5fwT0UPMhIf9Vt0zdG6vvP/lV+RlVhlrEfFq3Ep9KgHFfXSJuAJ1q6G1vGaz4b3AEQO e3sA== X-Gm-Message-State: APjAAAV/cDvANjWJ6+lJPp7xssl1b9VCEOZfM4um0Kt9yaBEoCl2a7kV exqxlj+YBpxMSaUVL7eqKXkq5Rs2KMQ= X-Google-Smtp-Source: APXvYqzOMJEANevD6t59eVnsdwZrTRQW75dBWpl7CVRc4RXjsqNuZZp5WbBSkG+wgGnzgh1+pmpl0g== X-Received: by 2002:adf:f292:: with SMTP id k18mr8696526wro.321.1558037897175; Thu, 16 May 2019 13:18:17 -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 q4sm5490954wrx.25.2019.05.16.13.18.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 May 2019 13:18:16 -0700 (PDT) Date: Thu, 16 May 2019 21:18:14 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, shenglei.zhang@intel.com Cc: ard.biesheuvel@linaro.org Subject: Re: [edk2-devel] [PATCH edk2-platforms 12/16] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg's include fragment file. Message-ID: <20190516201814.ck6kq7xbkzm67ykg@bivouac.eciton.net> References: <20190515085701.24724-1-shenglei.zhang@intel.com> <20190515085701.24724-13-shenglei.zhang@intel.com> MIME-Version: 1.0 In-Reply-To: <20190515085701.24724-13-shenglei.zhang@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > --- > 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 > > > >