Re: [platforms: PATCH v2 1/4] Marvell/Armada: Switch to dynamic tftp command

[Leif Lindholm <leif.lindholm@linaro.org>]

On Fri, Dec 01, 2017 at 04:35:04PM +0100, Marcin Wojtas wrote:
> After removal of the tftp library in EDK2, the tftp was
> disabled on Armada platform. Re-enable this functionality
> as a dynamic command on Armada 70x0 DB board. For this
> purpose add it as a build-time selectable option, depending
> on a new INCLUDE_TFTP_COMMAND parameter.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Armada/Armada.dsc.inc | 4 ++++
>  Platform/Marvell/Armada/Armada70x0.dsc | 1 +
>  Platform/Marvell/Armada/Armada70x0.fdf | 3 +++
>  3 files changed, 8 insertions(+)
> 
> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
> index 2a8a226..6040493 100644
> --- a/Platform/Marvell/Armada/Armada.dsc.inc
> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
> @@ -525,6 +525,10 @@
>        gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
>    }
>  
> +!ifdef $(INCLUDE_TFTP_COMMAND)
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> +!endif #$(INCLUDE_TFTP_COMMAND)
> +
>  [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
>    GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>  
> diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada/Armada70x0.dsc
> index 8e4cdb2..4e7d43c 100644
> --- a/Platform/Marvell/Armada/Armada70x0.dsc
> +++ b/Platform/Marvell/Armada/Armada70x0.dsc
> @@ -44,6 +44,7 @@
>    BUILD_TARGETS                  = DEBUG|RELEASE
>    SKUID_IDENTIFIER               = DEFAULT
>    FLASH_DEFINITION               = Platform/Marvell/Armada/Armada70x0.fdf
> +  DEFINE INCLUDE_TFTP_COMMAND    = 1

This looks very much to me like it will always include the tftp
command, which is not what I wanted.

Then again, you have done _exactly_ what I requested in emulating
what the Hisilicon platforms do (and will shortly stop doing).

My thoughts were that, since this is a debug/development feature, it
would be enabled at build time by adding -D INCLUDE_TFTP_COMMAND to
the build command line.

As such, do you have any issues with me deleting this hunk before
pushing? If not:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

>  
>  !include Armada.dsc.inc
>  
> diff --git a/Platform/Marvell/Armada/Armada70x0.fdf b/Platform/Marvell/Armada/Armada70x0.fdf
> index ca92c60..c03bc42 100644
> --- a/Platform/Marvell/Armada/Armada70x0.fdf
> +++ b/Platform/Marvell/Armada/Armada70x0.fdf
> @@ -176,6 +176,9 @@ FvNameGuid         = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>  
>    # UEFI application (Shell Embedded Boot Loader)
>    INF ShellPkg/Application/Shell/Shell.inf
> +!ifdef $(INCLUDE_TFTP_COMMAND)
> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> +!endif #$(INCLUDE_TFTP_COMMAND)
>  
>    # Bds
>    INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
> -- 
> 2.7.4
>