From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::243; helo=mail-wm0-x243.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::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 2F2E5221660ED for ; Thu, 30 Nov 2017 02:51:59 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id f9so11645454wmh.0 for ; Thu, 30 Nov 2017 02:56:25 -0800 (PST) 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=iqTPJSSCfwTca6kEl+TZ/vhZnI6k68BnEb+y0X35FDw=; b=FMRBz4ljuvWrn7g6z6nnfD2QoDu8obdcJUkH9N6tXgIbvtS6yOyMMPBAh3A7QGKN2c fbLowCG0TgMRLWnCsQA1Gq7mbGT2JXepG22/XVvN6UxfK09GsYIYbkdAgpWlONAEMCtO iPnVCxLtWd3FesjsWUbpBEdlaSQJEj4cII/j0= 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=iqTPJSSCfwTca6kEl+TZ/vhZnI6k68BnEb+y0X35FDw=; b=tf5sryg0vna19LynCvRuh1odZkfNoOucOioNxL7d/v31SrZ5Wy2NIcmZL6N+fnOWqZ Trft1dBXMCYXOAHfscKjYnr4RUY4iEmTWymXOXOMcG5aqGPm9iNaL3bPEu4AHyLT9/dm eJWT+lWfzuOJM4GKe5Fp0A2qGRNgVX6BxBiUmARZb4bLc8Or5vP+MjPygQiROUFPBgtD CCNYkQyuDH9lrZis9NgxskRxSN8rlsWGaHSnJMF5owEMTXtGKYw1xlisslxqZIxRo7oM JZrnpDJnJovrVFBpEHI0nA0mvdIIvc74c1KogwCfz0fx8lOaM9/nU6IY40REXWjqVScj wW2w== X-Gm-Message-State: AJaThX6/ppK+Zugbfw9LL1F4S5jHpz/yCBsZBOgubtt7llapQzGIgfnr zvmDU2dJsOChtL9kgYUsWXwY5A== X-Google-Smtp-Source: AGs4zMakDnXqqjJspVNkT3EHJM0Qg4UY8OUnvmx7eD8Ma34a8wLVUtOzgQ9t3x3v2LvYZUDesTR57g== X-Received: by 10.28.232.70 with SMTP id f67mr1546208wmh.90.1512039383822; Thu, 30 Nov 2017 02:56:23 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id r71sm4198457wmd.20.2017.11.30.02.56.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Nov 2017 02:56:22 -0800 (PST) Date: Thu, 30 Nov 2017 10:56:20 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: edk2-devel@lists.01.org, joakim.bech@linaro.org Message-ID: <20171130105620.7uuym434jgiklpaf@bivouac.eciton.net> References: <20171130090721.32065-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 In-Reply-To: <20171130090721.32065-1-ard.biesheuvel@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) 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 10:52:00 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > [Components.ARM] > > -- > 2.11.0 >