* [edk2-platforms][PATCH v2 0/1] Platform/RPi3: Add TFTP command to UEFI Shell @ 2019-10-18 12:41 Pete Batard 2019-10-18 12:41 ` [edk2-platforms][PATCH v2 1/1] " Pete Batard 0 siblings, 1 reply; 6+ messages in thread From: Pete Batard @ 2019-10-18 12:41 UTC (permalink / raw) To: devel; +Cc: ard.biesheuvel, leif.lindholm Previous version had '!ifdef $(INCLUDE_TFTP_COMMAND)' in the .fdf whereas it was supposed to be '!if $(INCLUDE_TFTP_COMMAND) == TRUE'. This v2 fixes that. Pete Batard (1): Platform/RPi3: Add TFTP command to UEFI Shell Platform/RaspberryPi/RPi3/RPi3.dsc | 8 ++++++++ Platform/RaspberryPi/RPi3/RPi3.fdf | 3 +++ 2 files changed, 11 insertions(+) -- 2.21.0.windows.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [edk2-platforms][PATCH v2 1/1] Platform/RPi3: Add TFTP command to UEFI Shell 2019-10-18 12:41 [edk2-platforms][PATCH v2 0/1] Platform/RPi3: Add TFTP command to UEFI Shell Pete Batard @ 2019-10-18 12:41 ` Pete Batard 2019-10-18 12:52 ` Leif Lindholm 0 siblings, 1 reply; 6+ messages in thread From: Pete Batard @ 2019-10-18 12:41 UTC (permalink / raw) To: devel; +Cc: ard.biesheuvel, leif.lindholm TFTP support, which is enabled by default, can be disabled by setting INCLUDE_TFTP_COMMAND to FALSE. Signed-off-by: Pete Batard <pete@akeo.ie> --- Platform/RaspberryPi/RPi3/RPi3.dsc | 8 ++++++++ Platform/RaspberryPi/RPi3/RPi3.fdf | 3 +++ 2 files changed, 11 insertions(+) diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc index bc424a06bb45..2289ad8c2ed2 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -36,6 +36,7 @@ [Defines] # -D FLAG=VALUE # DEFINE SECURE_BOOT_ENABLE = FALSE + DEFINE INCLUDE_TFTP_COMMAND = TRUE DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F ################################################################################ @@ -181,6 +182,10 @@ [LibraryClasses.common.DXE_DRIVER] SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf +!if $(INCLUDE_TFTP_COMMAND) == TRUE + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf +!endif [LibraryClasses.common.UEFI_APPLICATION] PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf @@ -616,3 +621,6 @@ [Components.common] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x200000 } +!if $(INCLUDE_TFTP_COMMAND) == TRUE + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf index 17c0094ac1cf..b06a15fb8ec3 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.fdf +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf @@ -232,6 +232,9 @@ [FV.FvMain] # UEFI application (Shell Embedded Boot Loader) # INF ShellPkg/Application/Shell/Shell.inf +!if $(INCLUDE_TFTP_COMMAND) == TRUE + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif # # ACPI Support -- 2.21.0.windows.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-platforms][PATCH v2 1/1] Platform/RPi3: Add TFTP command to UEFI Shell 2019-10-18 12:41 ` [edk2-platforms][PATCH v2 1/1] " Pete Batard @ 2019-10-18 12:52 ` Leif Lindholm 2019-10-18 13:25 ` Pete Batard 0 siblings, 1 reply; 6+ messages in thread From: Leif Lindholm @ 2019-10-18 12:52 UTC (permalink / raw) To: Pete Batard; +Cc: devel, ard.biesheuvel On Fri, Oct 18, 2019 at 01:41:30PM +0100, Pete Batard wrote: > TFTP support, which is enabled by default, can be disabled by setting > INCLUDE_TFTP_COMMAND to FALSE. Would you be OK with flipping the default to FALSE? It is a custom extension not described by the UEFI Shell Specification. I could flip the logic in the DEFINE and commit message if so, no need for a v3. Regards, Leif > Signed-off-by: Pete Batard <pete@akeo.ie> > --- > Platform/RaspberryPi/RPi3/RPi3.dsc | 8 ++++++++ > Platform/RaspberryPi/RPi3/RPi3.fdf | 3 +++ > 2 files changed, 11 insertions(+) > > diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc > index bc424a06bb45..2289ad8c2ed2 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.dsc > +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc > @@ -36,6 +36,7 @@ [Defines] > # -D FLAG=VALUE > # > DEFINE SECURE_BOOT_ENABLE = FALSE > + DEFINE INCLUDE_TFTP_COMMAND = TRUE > DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F > > ################################################################################ > @@ -181,6 +182,10 @@ [LibraryClasses.common.DXE_DRIVER] > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > +!if $(INCLUDE_TFTP_COMMAND) == TRUE > + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > +!endif > > [LibraryClasses.common.UEFI_APPLICATION] > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > @@ -616,3 +621,6 @@ [Components.common] > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x200000 > } > +!if $(INCLUDE_TFTP_COMMAND) == TRUE > + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > +!endif > diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf > index 17c0094ac1cf..b06a15fb8ec3 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.fdf > +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf > @@ -232,6 +232,9 @@ [FV.FvMain] > # UEFI application (Shell Embedded Boot Loader) > # > INF ShellPkg/Application/Shell/Shell.inf > +!if $(INCLUDE_TFTP_COMMAND) == TRUE > + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > +!endif > > # > # ACPI Support > -- > 2.21.0.windows.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-platforms][PATCH v2 1/1] Platform/RPi3: Add TFTP command to UEFI Shell 2019-10-18 12:52 ` Leif Lindholm @ 2019-10-18 13:25 ` Pete Batard 2019-10-18 14:05 ` [edk2-devel] " Philippe Mathieu-Daudé 0 siblings, 1 reply; 6+ messages in thread From: Pete Batard @ 2019-10-18 13:25 UTC (permalink / raw) To: Leif Lindholm; +Cc: devel, ard.biesheuvel On 2019.10.18 13:52, Leif Lindholm wrote: > On Fri, Oct 18, 2019 at 01:41:30PM +0100, Pete Batard wrote: >> TFTP support, which is enabled by default, can be disabled by setting >> INCLUDE_TFTP_COMMAND to FALSE. > > Would you be OK with flipping the default to FALSE? Yes, I have no issue with a default set to FALSE. > It is a custom extension not described by the UEFI Shell > Specification. > > I could flip the logic in the DEFINE and commit message if so, no need > for a v3. If you can do that, that would be great. Thanks! /Pete > > Regards, > > Leif > >> Signed-off-by: Pete Batard <pete@akeo.ie> >> --- >> Platform/RaspberryPi/RPi3/RPi3.dsc | 8 ++++++++ >> Platform/RaspberryPi/RPi3/RPi3.fdf | 3 +++ >> 2 files changed, 11 insertions(+) >> >> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc >> index bc424a06bb45..2289ad8c2ed2 100644 >> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc >> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc >> @@ -36,6 +36,7 @@ [Defines] >> # -D FLAG=VALUE >> # >> DEFINE SECURE_BOOT_ENABLE = FALSE >> + DEFINE INCLUDE_TFTP_COMMAND = TRUE >> DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F >> >> ################################################################################ >> @@ -181,6 +182,10 @@ [LibraryClasses.common.DXE_DRIVER] >> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf >> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf >> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf >> +!if $(INCLUDE_TFTP_COMMAND) == TRUE >> + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf >> +!endif >> >> [LibraryClasses.common.UEFI_APPLICATION] >> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf >> @@ -616,3 +621,6 @@ [Components.common] >> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 >> gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x200000 >> } >> +!if $(INCLUDE_TFTP_COMMAND) == TRUE >> + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> +!endif >> diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf >> index 17c0094ac1cf..b06a15fb8ec3 100644 >> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf >> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf >> @@ -232,6 +232,9 @@ [FV.FvMain] >> # UEFI application (Shell Embedded Boot Loader) >> # >> INF ShellPkg/Application/Shell/Shell.inf >> +!if $(INCLUDE_TFTP_COMMAND) == TRUE >> + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >> +!endif >> >> # >> # ACPI Support >> -- >> 2.21.0.windows.1 >> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH v2 1/1] Platform/RPi3: Add TFTP command to UEFI Shell 2019-10-18 13:25 ` Pete Batard @ 2019-10-18 14:05 ` Philippe Mathieu-Daudé 2019-10-18 15:28 ` Leif Lindholm 0 siblings, 1 reply; 6+ messages in thread From: Philippe Mathieu-Daudé @ 2019-10-18 14:05 UTC (permalink / raw) To: devel, pete, Leif Lindholm; +Cc: ard.biesheuvel On 10/18/19 3:25 PM, Pete Batard wrote: > On 2019.10.18 13:52, Leif Lindholm wrote: >> On Fri, Oct 18, 2019 at 01:41:30PM +0100, Pete Batard wrote: >>> TFTP support, which is enabled by default, can be disabled by setting >>> INCLUDE_TFTP_COMMAND to FALSE. >> >> Would you be OK with flipping the default to FALSE? > > Yes, I have no issue with a default set to FALSE. > >> It is a custom extension not described by the UEFI Shell >> Specification. >> >> I could flip the logic in the DEFINE and commit message if so, no need >> for a v3. > > If you can do that, that would be great. Thanks! Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com> > > /Pete > >> >> Regards, >> >> Leif >> >>> Signed-off-by: Pete Batard <pete@akeo.ie> >>> --- >>> Platform/RaspberryPi/RPi3/RPi3.dsc | 8 ++++++++ >>> Platform/RaspberryPi/RPi3/RPi3.fdf | 3 +++ >>> 2 files changed, 11 insertions(+) >>> >>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc >>> b/Platform/RaspberryPi/RPi3/RPi3.dsc >>> index bc424a06bb45..2289ad8c2ed2 100644 >>> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc >>> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc >>> @@ -36,6 +36,7 @@ [Defines] >>> # -D FLAG=VALUE >>> # >>> DEFINE SECURE_BOOT_ENABLE = FALSE >>> + DEFINE INCLUDE_TFTP_COMMAND = TRUE >>> DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F >>> >>> ################################################################################ >>> >>> @@ -181,6 +182,10 @@ [LibraryClasses.common.DXE_DRIVER] >>> >>> SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf >>> >>> >>> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf >>> >>> >>> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf >>> >>> +!if $(INCLUDE_TFTP_COMMAND) == TRUE >>> + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >>> + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf >>> +!endif >>> [LibraryClasses.common.UEFI_APPLICATION] >>> >>> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf >>> >>> @@ -616,3 +621,6 @@ [Components.common] >>> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 >>> gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x200000 >>> } >>> +!if $(INCLUDE_TFTP_COMMAND) == TRUE >>> + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >>> +!endif >>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf >>> b/Platform/RaspberryPi/RPi3/RPi3.fdf >>> index 17c0094ac1cf..b06a15fb8ec3 100644 >>> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf >>> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf >>> @@ -232,6 +232,9 @@ [FV.FvMain] >>> # UEFI application (Shell Embedded Boot Loader) >>> # >>> INF ShellPkg/Application/Shell/Shell.inf >>> +!if $(INCLUDE_TFTP_COMMAND) == TRUE >>> + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >>> +!endif >>> # >>> # ACPI Support >>> -- >>> 2.21.0.windows.1 >>> > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH v2 1/1] Platform/RPi3: Add TFTP command to UEFI Shell 2019-10-18 14:05 ` [edk2-devel] " Philippe Mathieu-Daudé @ 2019-10-18 15:28 ` Leif Lindholm 0 siblings, 0 replies; 6+ messages in thread From: Leif Lindholm @ 2019-10-18 15:28 UTC (permalink / raw) To: pete, Philippe Mathieu-Daudé; +Cc: devel, ard.biesheuvel On Fri, Oct 18, 2019 at 04:05:59PM +0200, Philippe Mathieu-Daudé wrote: > On 10/18/19 3:25 PM, Pete Batard wrote: > > On 2019.10.18 13:52, Leif Lindholm wrote: > > > On Fri, Oct 18, 2019 at 01:41:30PM +0100, Pete Batard wrote: > > > > TFTP support, which is enabled by default, can be disabled by setting > > > > INCLUDE_TFTP_COMMAND to FALSE. > > > > > > Would you be OK with flipping the default to FALSE? > > > > Yes, I have no issue with a default set to FALSE. > > > > > It is a custom extension not described by the UEFI Shell > > > Specification. > > > > > > I could flip the logic in the DEFINE and commit message if so, no need > > > for a v3. > > > > If you can do that, that would be great. Thanks! > > Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com> Thanks. Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> Pushed as f8c5d83e0042. > > > > /Pete > > > > > > > > Regards, > > > > > > Leif > > > > > > > Signed-off-by: Pete Batard <pete@akeo.ie> > > > > --- > > > > Platform/RaspberryPi/RPi3/RPi3.dsc | 8 ++++++++ > > > > Platform/RaspberryPi/RPi3/RPi3.fdf | 3 +++ > > > > 2 files changed, 11 insertions(+) > > > > > > > > diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc > > > > b/Platform/RaspberryPi/RPi3/RPi3.dsc > > > > index bc424a06bb45..2289ad8c2ed2 100644 > > > > --- a/Platform/RaspberryPi/RPi3/RPi3.dsc > > > > +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc > > > > @@ -36,6 +36,7 @@ [Defines] > > > > # -D FLAG=VALUE > > > > # > > > > DEFINE SECURE_BOOT_ENABLE = FALSE > > > > + DEFINE INCLUDE_TFTP_COMMAND = TRUE > > > > DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F > > > > ################################################################################ > > > > > > > > @@ -181,6 +182,10 @@ [LibraryClasses.common.DXE_DRIVER] > > > > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf > > > > > > > > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > > > > > > > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > > > > > > > > +!if $(INCLUDE_TFTP_COMMAND) == TRUE > > > > + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > > > > + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > > > > +!endif > > > > [LibraryClasses.common.UEFI_APPLICATION] > > > > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > > > > > > > > @@ -616,3 +621,6 @@ [Components.common] > > > > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > > > > gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x200000 > > > > } > > > > +!if $(INCLUDE_TFTP_COMMAND) == TRUE > > > > + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > > > > +!endif > > > > diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf > > > > b/Platform/RaspberryPi/RPi3/RPi3.fdf > > > > index 17c0094ac1cf..b06a15fb8ec3 100644 > > > > --- a/Platform/RaspberryPi/RPi3/RPi3.fdf > > > > +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf > > > > @@ -232,6 +232,9 @@ [FV.FvMain] > > > > # UEFI application (Shell Embedded Boot Loader) > > > > # > > > > INF ShellPkg/Application/Shell/Shell.inf > > > > +!if $(INCLUDE_TFTP_COMMAND) == TRUE > > > > + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > > > > +!endif > > > > # > > > > # ACPI Support > > > > -- > > > > 2.21.0.windows.1 > > > > > > > > > > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-18 15:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-18 12:41 [edk2-platforms][PATCH v2 0/1] Platform/RPi3: Add TFTP command to UEFI Shell Pete Batard 2019-10-18 12:41 ` [edk2-platforms][PATCH v2 1/1] " Pete Batard 2019-10-18 12:52 ` Leif Lindholm 2019-10-18 13:25 ` Pete Batard 2019-10-18 14:05 ` [edk2-devel] " Philippe Mathieu-Daudé 2019-10-18 15:28 ` Leif Lindholm
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox