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::243; helo=mail-wr0-x243.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (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 1DCED221523A5 for ; Mon, 4 Dec 2017 09:12:49 -0800 (PST) Received: by mail-wr0-x243.google.com with SMTP id o2so18148988wro.5 for ; Mon, 04 Dec 2017 09:17:19 -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=Vv8cUWdbGSRPDeQNRgAqEEXnLvEJMek3dXEOXBpmJHs=; b=SaxVONe3eKL7ktHoBjVAX7pdEP+UezVBQqqhs1XAs3WpqymyXPkdJ+sXnD0lLLuoUP Zbp0MLe/c8YiIpN0uKnNlbDzeeOTYYcKdgm4fFgP+gZLzDVN7KGJVQ2GfwNRst7+ku3N 6nbMcMtZUJxCxobF0TySf6wLlzjfeWXaEKlGU= 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=Vv8cUWdbGSRPDeQNRgAqEEXnLvEJMek3dXEOXBpmJHs=; b=FIRj1thxTqSEVo6LFc2rUC4exqVASnbY2q+fVejI7CjG28gLu+7TriD14MxbQvyAza QK5cdXlzvX8EOvpnM5m2Oh9WPjuc0v3VpUmGQ4YJZtyW13hDbedGQuWJOB+rnpXy8P7S 7AUOAk7bgvO/W/lxIDg1J21kMpv+dzO0aLZuqXK8dTQHOyuRogfOMFzwbdaDlA/+h70J a3xPQpvZfUivVwVzJN8zp/5aUIdT+0HNNuk9FkIsd1Cgm6sunxRntG4wd6q7bCcWXDeC 8cJPmGKZnHaJVe11d/BWjtR2io6uYoo1n1ZMR9kTceYOlDW7eWnxHgr2ykINV+hOKMln FEIA== X-Gm-Message-State: AJaThX5URBwNxT9k8BrC9pxjHq8/mMi6PPmPi8gL5kuMyYcrTSQ5ANjP bRBVcdrdjihfPLnLiKV4mr9JyOdNAnE= X-Google-Smtp-Source: AGs4zMa2ng1+0I+KXMpNf0e8v3gn4FJvq4alQ4FU1OySLvWMPplbBXSwR/OP2oDmvuIX6AzQQTI9vA== X-Received: by 10.223.157.138 with SMTP id p10mr14922390wre.28.1512407837735; Mon, 04 Dec 2017 09:17:17 -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 j13sm15780018wre.55.2017.12.04.09.17.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Dec 2017 09:17:16 -0800 (PST) Date: Mon, 4 Dec 2017 17:17:15 +0000 From: Leif Lindholm To: Ard Biesheuvel Cc: "edk2-devel@lists.01.org" Message-ID: <20171204171714.ju6ezajbhgoensca@bivouac.eciton.net> References: <20171204171325.3359-1-leif.lindholm@linaro.org> <20171204171325.3359-2-leif.lindholm@linaro.org> MIME-Version: 1.0 In-Reply-To: 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:12:49 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 :) > 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 > >