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 A7F82221523A1 for ; Mon, 4 Dec 2017 09:24:16 -0800 (PST) Received: by mail-wr0-x244.google.com with SMTP id z34so18186782wrz.10 for ; Mon, 04 Dec 2017 09:28:46 -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=dmgCLPb0lRdnJg1wrWXNLpSa29T79QrjE/aKrApAKSY=; b=QvQ5U2IRekt64CAY3qYyN1PqD63qBZi+wRaDFvdFlwIaE65BPD32+mnoJLnmfDM1Yr vHrSbSUB7OHPIFwyC6eMz8FoxE3fDBMQsLN0ycWH39Olodb5RaXeRdwdDWU/riEeeiVP 4nQjpwzPwr1ZC171VXsUiKE+MFcOupszcEcL4= 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=dmgCLPb0lRdnJg1wrWXNLpSa29T79QrjE/aKrApAKSY=; b=ppSKbENW3gXWQ3d8vaRSxJ7c7tDvEgoRzYlzTV+EeC4SeajQdir/W7Ai6pp1Qj3S7t 34aYf051q9D20tlTkYkmpDi3Ntt3NSnvpu5Xm4MI1fMeMvVQVCyIApc4uxPSby2WpNAg 8cuUp/BIQKvKIeQ32P8s7GYhl8CxUUtALGhIzM7D/oLp0AERyGZJfYbFbG9sRA5apt/Q AEPT6m0GNjzDPXnthWrGR1XNjI7IAF+eUOKqhQ4OM6sJE7la5kkwiQNa0sWMh9ujeNB5 9W+vCHp6JA/fvEZd43TVdGnrbDUjk5grl0Im9WW+6z5aMGjRLXnucUSTz3jkyD8Pt3Bc YUvw== X-Gm-Message-State: AJaThX4Xc4YGNdowGbL9G/be63Ols9LbRPW4dd1s8i+FM4Bt4HCoEBwk jlZThM2/XKUFK60gcJxadOPDG0Iuw2g= X-Google-Smtp-Source: AGs4zMYFDCN73Aehfu4uUbwSWvwuVPc0/SQYPXWg2w+X2XmZPBw7Jr3GVPX46o8G7W6iN3A64++fog== X-Received: by 10.223.163.138 with SMTP id l10mr13112853wrb.247.1512408525297; Mon, 04 Dec 2017 09:28:45 -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 o27sm12496791wro.9.2017.12.04.09.28.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 09:28:43 -0800 (PST) Date: Mon, 4 Dec 2017 17:28:42 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: "edk2-devel@lists.01.org" Message-ID: <20171204172842.7hy4zcogiigx6axn@bivouac.eciton.net> References: <20171204171325.3359-1-leif.lindholm@linaro.org> <20171204171325.3359-2-leif.lindholm@linaro.org> <20171204171714.ju6ezajbhgoensca@bivouac.eciton.net> MIME-Version: 1.0 In-Reply-To: <20171204171714.ju6ezajbhgoensca@bivouac.eciton.net> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell 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 17:24:17 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Dec 04, 2017 at 05:17:15PM +0000, Leif Lindholm wrote: > On Mon, Dec 04, 2017 at 05:15:35PM +0000, Ard Biesheuvel wrote: > > On 4 December 2017 at 17:13, Leif Lindholm wrote: > > > D02, D03 and D05 all have nice conditional clauses to only include > > > the non-standard tftp shell command ifdef(INCLUDE_TFTP_COMMAND). > > > > > > Unfortunately, they all explicitly set DEFINE INCLUDE_TFTP_COMMAND=1 in > > > their platform description files, meaning there is no way to exclude the > > > command without an editor. > > > > > > So remove the DEFINE and let people specify on the command line whether > > > to include it, as originally intended. > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > Signed-off-by: Leif Lindholm > > > > Assuming that not defining the macro is the same as defining it to 0 > > Well, the test was ifdef, which is what made the below a bug rather > than an undesirable default :) (After confirming with Ard on IRC that the above was a resonable explanation.) Series pushed as 7511d626b3..84c212b1b4. Thanks. > > Reviewed-by: Ard Biesheuvel > > > > > --- > > > Platform/Hisilicon/D02/Pv660D02.dsc | 1 - > > > Platform/Hisilicon/D03/D03.dsc | 1 - > > > Platform/Hisilicon/D05/D05.dsc | 1 - > > > 3 files changed, 3 deletions(-) > > > > > > diff --git a/Platform/Hisilicon/D02/Pv660D02.dsc b/Platform/Hisilicon/D02/Pv660D02.dsc > > > index ab7c7ba7b7..a2a94945e5 100644 > > > --- a/Platform/Hisilicon/D02/Pv660D02.dsc > > > +++ b/Platform/Hisilicon/D02/Pv660D02.dsc > > > @@ -28,7 +28,6 @@ [Defines] > > > BUILD_TARGETS = DEBUG|RELEASE > > > SKUID_IDENTIFIER = DEFAULT > > > FLASH_DEFINITION = Platform/Hisilicon/D02/$(PLATFORM_NAME).fdf > > > - DEFINE INCLUDE_TFTP_COMMAND=1 > > > > > > !include Silicon/Hisilicon/Hisilicon.dsc.inc > > > > > > diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc > > > index 00b459ab35..d37c370648 100644 > > > --- a/Platform/Hisilicon/D03/D03.dsc > > > +++ b/Platform/Hisilicon/D03/D03.dsc > > > @@ -28,7 +28,6 @@ [Defines] > > > BUILD_TARGETS = DEBUG|RELEASE > > > SKUID_IDENTIFIER = DEFAULT > > > FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf > > > - DEFINE INCLUDE_TFTP_COMMAND=1 > > > > > > !include Silicon/Hisilicon/Hisilicon.dsc.inc > > > > > > diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc > > > index 60eca3c6fc..1574c3feef 100644 > > > --- a/Platform/Hisilicon/D05/D05.dsc > > > +++ b/Platform/Hisilicon/D05/D05.dsc > > > @@ -29,7 +29,6 @@ [Defines] > > > SKUID_IDENTIFIER = DEFAULT > > > FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf > > > DEFINE EDK2_SKIP_PEICORE=0 > > > - DEFINE INCLUDE_TFTP_COMMAND=1 > > > DEFINE NETWORK_IP6_ENABLE = FALSE > > > DEFINE HTTP_BOOT_ENABLE = FALSE > > > > > > -- > > > 2.11.0 > > >