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::241; helo=mail-oi0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-oi0-x241.google.com (mail-oi0-x241.google.com [IPv6:2607:f8b0:4003:c06::241]) (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 E454F221523A5 for ; Mon, 4 Dec 2017 09:11:06 -0800 (PST) Received: by mail-oi0-x241.google.com with SMTP id t78so12201499oie.8 for ; Mon, 04 Dec 2017 09:15:36 -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=7XOcpDhxCgzms+pbZtrx7x4J67/ZXuffzdQMQbQnc/c=; b=hDKwKFLSV+o5xWGwEd1/kgh+qfAt/e3ONGvnmZ6ZDOlSkoqhTk8i+3ObXoz8mYqY/f 7nRMKu6kCezrGThfgoBB8zuy4WNOPs5f/E53RlVDZzpqDHrjYoCmH5tJSfHezbDeDUNa kfM9KoHDwyde/UhJWmT3sc5K0M/ILDmYIGpPE= 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=7XOcpDhxCgzms+pbZtrx7x4J67/ZXuffzdQMQbQnc/c=; b=I/0/wBQCd00iDKRRcPL1yeugRQVit2FnAxvJLrryH64t6wOLAa4evNQFfvgcb7Q36x i/PiTQcnYHKk3P7tIUb7TKbvZESKk1sgiT+7c5U9ISpYVTHB0oZLY4woSL13FGKr91f5 6WYYOVb3geQLIQJjj8QINHxkg26rfw5YabFWzDWqHzIfd9dgNOcR8z9J76Ld4HTeuh+W julcWRZFK7mwCP0myoB1TLFvpoQwkcmveRpp2SIAipRNSTF9GAGBcjIV1F0uiVTNY98c 8Ynh0jaXr3nDZZzAH8uetefyVospWTSmdU0Dm8HpP3USt9pISeHJoky0Pdp9G6KyOlfa yqHQ== X-Gm-Message-State: AJaThX6HIiZylYQDlgNEQEeq71/JEtHcZvf4dhsyXEt1U2uYfwvnsX/e +Ajwubg4NAX+AZ7Gv+pXnTXaiNF5tNX0uQbxyLd+aQ== X-Google-Smtp-Source: AGs4zMbQpeKm3eCiQN1X8y79tKhmOuzLpl+6GhnWRiukJqZZ11wRNGoUVxfIRhIl92y6OiyEMgbn8glhei5DzKlZAEw= X-Received: by 10.202.81.4 with SMTP id f4mr15358450oib.309.1512407736081; Mon, 04 Dec 2017 09:15:36 -0800 (PST) MIME-Version: 1.0 Received: by 10.157.46.103 with HTTP; Mon, 4 Dec 2017 09:15:35 -0800 (PST) In-Reply-To: <20171204171325.3359-2-leif.lindholm@linaro.org> References: <20171204171325.3359-1-leif.lindholm@linaro.org> <20171204171325.3359-2-leif.lindholm@linaro.org> From: Ard Biesheuvel Date: Mon, 4 Dec 2017 17:15:35 +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:11:07 -0000 Content-Type: text/plain; charset="UTF-8" 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 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 >