From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4003:c06::243; helo=mail-oi0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-oi0-x243.google.com (mail-oi0-x243.google.com [IPv6:2607:f8b0:4003:c06::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 00AB2221523A1 for ; Mon, 4 Dec 2017 09:23:20 -0800 (PST) Received: by mail-oi0-x243.google.com with SMTP id f69so12223280oig.10 for ; Mon, 04 Dec 2017 09:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=bEptwNyLh+9RN6+UF1D0XL3BtNt7Y3y8DDnOdkC0nQg=; b=g8w4wQI5dUrA2AJXd8okZVyXNFMVTWdRbQ4b/3Vn5i1nmHmdQrxJ5y1nkY9dYHlQeF vhcuOze7HGZ/aX8tlqYvzsMFyJLgJOCSCTi5HI99sWJ1D62UlQxozLTeR4eVEfLA5gX0 jn8SqGynZ4IRzzOjJWSHGh1hhCAlOIAx02bNY= 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=bEptwNyLh+9RN6+UF1D0XL3BtNt7Y3y8DDnOdkC0nQg=; b=FzTdgfKCJ+WeqI94NzzdcZeQM1KaLpy7zPgS5FLeiR1frub3HDAHDohAW1kAqg1GFx 6nVG89WLJ/9YGMATn4Mvhej7G1CFUKvGVPOMXJ9ryKWogDh0yN0cdjAZ3tQLwji+hMbn F7UiXTSKNrwqU497PrPsoPAwBnHbouz4QZGF8Ldu81Ou1x5gYetEUCGpm7EM3xcrsf2G fNzi4Ioga3fEQvGV9YFkYu7vzBbh+9Ynpyld062YSRXRry9jcmMsXvnDpZAH1PYa5Js7 Rh4ttmOdDORp7YJtYV2WwMBDn3Rg46yv9TwHnYYxooESFojbZ52yKmHhLTm+TiKkPp2S mjyA== X-Gm-Message-State: AJaThX6s4kODt2ieizTpXQn5AfxeNGUjc7y24mz5hvPI738ZtuTxC/Gr 6ULuV28z1OD/wzXyX0qMJpUrSjmLv+n7m01Ox6Ebbg== X-Google-Smtp-Source: AGs4zMYADvYhEjkcsPkCFuXakoJ7BXJfiX0zLoUThiQ8v05IAdBhnxiKC0SlDc9IlxpHY7Ra4IEP9b94ZCKu6FqKmNA= X-Received: by 10.202.198.83 with SMTP id w80mr15004245oif.139.1512408470109; Mon, 04 Dec 2017 09:27:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.157.46.103 with HTTP; Mon, 4 Dec 2017 09:27:49 -0800 (PST) In-Reply-To: <20171204171714.ju6ezajbhgoensca@bivouac.eciton.net> References: <20171204171325.3359-1-leif.lindholm@linaro.org> <20171204171325.3359-2-leif.lindholm@linaro.org> <20171204171714.ju6ezajbhgoensca@bivouac.eciton.net> From: Ard Biesheuvel Date: Mon, 4 Dec 2017 17:27:49 +0000 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" 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:23:21 -0000 Content-Type: text/plain; charset="UTF-8" On 4 December 2017 at 17:17, 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 :) > Ah right. I missed that. So yes, please remove that.