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.biesheu...@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.lindh...@linaro.org> > [Components.ARM] > > -- > 2.11.0 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
