From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c06::243; helo=mail-io0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x243.google.com (mail-io0-x243.google.com [IPv6:2607:f8b0:4001:c06::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7F408220C1C3E for ; Thu, 30 Nov 2017 05:35:36 -0800 (PST) Received: by mail-io0-x243.google.com with SMTP id s37so7513433ioe.10 for ; Thu, 30 Nov 2017 05:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=qh7jhXn57qsfK6AE8uRDWD/dsp6n1PK4gvxfriJm/mY=; b=AryF57ltfhcoMj94vfY8meRtDMGl5c3PF21j3PdHoLKxQ8iSDeTe9SmB+izJwf7JYO wDDQ5eZnS8UBiXQEoKLVU0Z4TP0QovooifBEEReryGN87LmVTHMsTa3LMDpJxIKgEXhM oAm7sH7mJvy4YfRLc6Z/LFB1/hST0paF1s1Sg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=qh7jhXn57qsfK6AE8uRDWD/dsp6n1PK4gvxfriJm/mY=; b=g72UZwC9Zy3pFynr3Eut8Qwg5u1TcpEW/2+G6gXgDtKdt2rw9TylH/a0Yce7zj9iBc 3Aq52bBP3RQUHfo5WEYs4x+I/GBWalmSjAe2EAGQA86n3MzhzdwtEuKS6NBn6pd26pdQ hY+l6Vuc5Ca9xr8CrBLPjgDrSFLVJBkIu1KZDqBzmQaq7KtUfY22M3onn5tWYYV55bCN AyMryAgYCmMaNNraUo+GWW/WDuPPsxpbeGHVwS/42G1NkJATbCPs1+mUuFJnSe27DrfX lvRuVqx1lB9xaGR12sZkU+kiiZUhEtbJ1i40iFAfLmLQd1Jc9y0Hn8lt64X6YxNFF+Cu FHAA== X-Gm-Message-State: AJaThX4/G9apibOqIMQTBzzwxFuY+ymKANu+tJwabcC68ZIPeC0rWpJR d/5JtkVoA/dwgQPaYgczgy48pg+j3Z8vr96SkKyqmIdNd40= X-Google-Smtp-Source: AGs4zMYfwIrQzd3PF5AkudDuy8Rw6YqKoktLLhdy+ZldjXljNNHU5p6fDT7fz8Bs3qDjc381t4Aiim1kFTIaNsDPncQ= X-Received: by 10.107.174.222 with SMTP id n91mr7506773ioo.43.1512049200949; Thu, 30 Nov 2017 05:40:00 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Thu, 30 Nov 2017 05:40:00 -0800 (PST) In-Reply-To: <20171130112848.GA26517@manjaro> References: <20171130090721.32065-1-ard.biesheuvel@linaro.org> <20171130105620.7uuym434jgiklpaf@bivouac.eciton.net> <20171130112848.GA26517@manjaro> From: Ard Biesheuvel Date: Thu, 30 Nov 2017 13:40:00 +0000 Message-ID: To: Joakim Bech Cc: Leif Lindholm , "edk2-devel@lists.01.org" Subject: Re: [PATCH edk2-platforms] Platform/ARM: move to new TFTP Shell command implementation X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Nov 2017 13:35:36 -0000 Content-Type: text/plain; charset="UTF-8" On 30 November 2017 at 11:28, Joakim Bech wrote: > On Thu, Nov 30, 2017 at 10:56:20AM +0000, Leif Lindholm wrote: >> On Thu, Nov 30, 2017 at 09:07:21AM +0000, Ard Biesheuvel wrote: >> > Upstream EDK2 has refactored the implementation of the TFTP Shell >> > command so update the ARM platforms accordingly. >> > >> > Instead of having to add the new module to all .FDF files under >> > Platform/ARM, add it to the 'networking FDF' include file and >> > include that everywhere. >> > >> > Contributed-under: TianoCore Contribution Agreement 1.1 >> > Signed-off-by: Ard Biesheuvel >> > --- >> > Platform/ARM/JunoPkg/ArmJuno.fdf | 13 ++----------- >> > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 13 ++----------- >> > Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc | 5 +++++ >> > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 2 +- >> > 4 files changed, 10 insertions(+), 23 deletions(-) >> > >> > diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf >> > index 52586135b525..72771b1170b0 100644 >> > --- a/Platform/ARM/JunoPkg/ArmJuno.fdf >> > +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf >> > @@ -183,17 +183,8 @@ [FV.FvMain] >> > # >> > # Networking stack >> > # >> > - 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 MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> > +!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc >> > + >> > INF EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf >> > !if 0 >> > INF OptionRomPkg/MarvellYukonDxe/MarvellYukonDxe.inf >> > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf >> > index 46e4b9ac6758..3c75a51570b8 100644 >> > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf >> > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf >> > @@ -148,17 +148,8 @@ [FV.FvMain] >> > # >> > # Networking stack >> > # >> > - 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 MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> > +!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc >> > + >> > INF EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf >> > >> > # >> > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc >> > index 57af0f70eee8..b0107f2bbabd 100644 >> > --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc >> > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc >> > @@ -25,3 +25,8 @@ >> > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> > + >> > + # >> > + # TFTP Shell command >> > + # >> > + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> >> Could you wrap this inside a >> !ifdef $(INCLUDE_TFTP_COMMAND) >> ? >> >> > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc >> > index d4c38747b33f..3f6aa31ec434 100644 >> > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc >> > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc >> > @@ -477,11 +477,11 @@ [Components.common] >> > NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf >> > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf >> > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf >> > - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf >> > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf >> > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> > } >> > + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> >> And this one? >> >> If you're happy to do that, and fold it in: >> Reviewed-by: Leif Lindholm >> > I've tested the initial patch (without Leif's proposal) and that worked > fine, so feel free to add: > Tested-by: Joakim Bech > Pushed as 6ec048e346de7189918d2c3644b14d92fa93b6be Thanks all.