From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 9284022152383 for ; Mon, 4 Dec 2017 07:00:12 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id l141so6375849wmg.1 for ; Mon, 04 Dec 2017 07:04:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=TPkwAygG6OLNIr3BqPQT0Etl6HkLwBZj8qu3HVzrh0c=; b=Q1I0ibkH96oV6v9uJCNwdmf4x/K5k6aJecxPLwxJKUbHLtw1t/+dSDQ3rVvzkHr21y sxsDMN7LNiem0zlij6ZE75pZhQc9+KYpctQu02FUj/FWENSR49CD1zf87NqUbvg/Hyqj B1nPbQPaDWOl5YuGk+9WueyfhQgylxBXyirVlj+o6IFJALTaDYDQwAlcjlaXYLsBNJ/R IWWAAsAYk3XUEGgwlZvvCzUBWSeRbT6BmYbYTLELKWhDkueG+f0afGPrZiXFa/XqCtwe fu/C0PHN5rKS6XAAPNsE7NkFGCLGxkFad0y+KA1TqK1Xi28+dKs6dFhiJmTIkeoqE8XS qYXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=TPkwAygG6OLNIr3BqPQT0Etl6HkLwBZj8qu3HVzrh0c=; b=P/FRMBNAsU9C6WwL1iniiXwwWwSo8UBQGiBxrrmV6wZ5IH+ukJd85ZIyZs3fv0Eu5Z 0QSvMHNsLgnQZ1diex9Kiv8oEs4Qxu9bO9y+H1Q781BxaAAwBJdHTeicts+vuQ3gqd9U LjvtKW4LfvDylu+cwX830xbLiBUhwu2xl81HSPMeDqtYXMbMYmO2QVSSPDewo60hZrKs /XnzI1Gpxi6VUHhxhZ0ySGa6CT2fy1ZEDQpb692/d+wvjZ8Kqh5eFj2/o7IoJmxbWoFj WWTo9kiX7Dwm0nft/qDBUVUJg9P3vjsAHgdX4Qvuu2gmH038K2JjvU+eKnRe0pQ27imG PqJg== X-Gm-Message-State: AKGB3mL0DZV3XKuo10rxMRadH3Vt/o+5iJBqoIkHPqPJwNoNVteQfQPY 527iDYwuNbjwGV0VJA2APnZ0FhbsYszYdjzCLrchMw== X-Google-Smtp-Source: AGs4zMbzWhMajSxEfCawgFx3lMPtmCWDZ/qVge/FNerultFNaMhEMr2Coia2aliM6+jODRXQyJGss5VOrW8XJrL8FTQ= X-Received: by 10.28.154.70 with SMTP id c67mr3133044wme.142.1512399880840; Mon, 04 Dec 2017 07:04:40 -0800 (PST) MIME-Version: 1.0 Received: by 10.223.163.207 with HTTP; Mon, 4 Dec 2017 07:04:40 -0800 (PST) In-Reply-To: <20171204133209.dux23iyzhxfgz7d6@bivouac.eciton.net> References: <1512142507-23282-1-git-send-email-mw@semihalf.com> <1512142507-23282-2-git-send-email-mw@semihalf.com> <20171204133209.dux23iyzhxfgz7d6@bivouac.eciton.net> From: Marcin Wojtas Date: Mon, 4 Dec 2017 16:04:40 +0100 Message-ID: To: Leif Lindholm Cc: edk2-devel-01 , Ard Biesheuvel , nadavh@marvell.com, Neta Zur Hershkovits , Kostya Porotchkin , Hua Jing , semihalf-dabros-jan 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 15:00:12 -0000 Content-Type: text/plain; charset="UTF-8" Hi Leif, 2017-12-04 14:32 GMT+01:00 Leif Lindholm : > 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). I took a look at Platform/Hisilicon/D02/Pv660D02.dsc and took the DEFINE method from there. > > 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. > It wasn't clear to me in such way :) > As such, do you have any issues with me deleting this hunk before > pushing? If not: > Reviewed-by: Leif Lindholm > Sure, please remove this line. Best regards, Marcin >> >> !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 >>