From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Joakim Bech <joakim.bech@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH edk2-platforms] Platform/ARM: move to new TFTP Shell command implementation
Date: Thu, 30 Nov 2017 13:40:00 +0000 [thread overview]
Message-ID: <CAKv+Gu_ATdXkfEWt1EDwM2q5BEgNOa8s8JJCkmctnmdev9da2w@mail.gmail.com> (raw)
In-Reply-To: <20171130112848.GA26517@manjaro>
On 30 November 2017 at 11:28, Joakim Bech <joakim.bech@linaro.org> 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 <ard.biesheuvel@linaro.org>
>> > ---
>> > 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 <leif.lindholm@linaro.org>
>>
> I've tested the initial patch (without Leif's proposal) and that worked
> fine, so feel free to add:
> Tested-by: Joakim Bech <joakim.bech@linaro.org>
>
Pushed as 6ec048e346de7189918d2c3644b14d92fa93b6be
Thanks all.
prev parent reply other threads:[~2017-11-30 13:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 9:07 [PATCH edk2-platforms] Platform/ARM: move to new TFTP Shell command implementation Ard Biesheuvel
2017-11-30 10:56 ` Leif Lindholm
[not found] ` <20171130112848.GA26517@manjaro>
2017-11-30 13:40 ` Ard Biesheuvel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAKv+Gu_ATdXkfEWt1EDwM2q5BEgNOa8s8JJCkmctnmdev9da2w@mail.gmail.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox