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:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (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 B797E22152383 for ; Mon, 4 Dec 2017 05:27:44 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id k61so17296501wrc.4 for ; Mon, 04 Dec 2017 05:32:14 -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=u2zobr3XivR3+K+AolqI53ibJSgkzxKEWDGGWhbCoLY=; b=SGF29GPnzzBtOwurrmOkknRu4+xZGCm25XW6bPhKWPL3uWOgILuWSLmkVIrk3QPd+U QSFSfuoDdTyuKEFi4LZobTeU4PMIpA02woS1E4irY+Lua2Ugoo3n4EgzJO17b6VhXo6R szWFLat9lQHW4upn31hocSRpmOzt/Uelx3Di8= 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=u2zobr3XivR3+K+AolqI53ibJSgkzxKEWDGGWhbCoLY=; b=YwnyAwVQUjwaNNzzL/eOIYpI3emaVxctYQzihV/ynB5spdcMNDZVNIRvQtUD/f2PMg xkduIkEpSnMucE34/DUecxrulCnxprwe2xShwp8K6Q78fUCSy6xOPIIoqb50fzAWBH7l dBInG9L4OUvSTL1ins/vu79BSoz9v595j0byRe4Tq3BasWn+oZ4cgr7PKOHx3Akm2uRE EkrhHmWpujvKWM/q9njueWEghADYQKVpqy1EdtnwVjdd5qH5R3npPQmqVkmWbuAN0D8t sSWMYr84r6CpZeC1MQcIFkjdz6VmG9FEDvEzvvr2clw4emRRsTNvBihUToqh4dqGqT1u 0weg== X-Gm-Message-State: AJaThX5PP17BF98+KDkGUffL/YdcTdE8YW5yPrK014Wai/w5eaULJF6/ ZR9jpY05z00bKTi2/m+mFvIpkg== X-Google-Smtp-Source: AGs4zMZzY3Mz2AzmwvUQqSDZafvanCpveditWhwFval+iauuL1o/B8AcXHTHkmmwJAfksoVHdqYFYw== X-Received: by 10.223.184.42 with SMTP id h39mr13188694wrf.38.1512394332762; Mon, 04 Dec 2017 05:32:12 -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 138sm3910684wmf.21.2017.12.04.05.32.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 05:32:11 -0800 (PST) Date: Mon, 4 Dec 2017 13:32:09 +0000 From: Leif Lindholm To: Marcin Wojtas Cc: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com, jinghua@marvell.com, jsd@semihalf.com Message-ID: <20171204133209.dux23iyzhxfgz7d6@bivouac.eciton.net> References: <1512142507-23282-1-git-send-email-mw@semihalf.com> <1512142507-23282-2-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1512142507-23282-2-git-send-email-mw@semihalf.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [platforms: PATCH v2 1/4] Marvell/Armada: Switch to dynamic tftp command 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: Mon, 04 Dec 2017 13:27:45 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > --- > 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 > > !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 >