From: Leif Lindholm <leif.lindholm@linaro.org>
To: edk2-devel@lists.01.org
Cc: ard.biesheuvel@linaro.org
Subject: [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command
Date: Mon, 4 Dec 2017 17:13:25 +0000 [thread overview]
Message-ID: <20171204171325.3359-2-leif.lindholm@linaro.org> (raw)
In-Reply-To: <20171204171325.3359-1-leif.lindholm@linaro.org>
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 <leif.lindholm@linaro.org>
---
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
next prev parent reply other threads:[~2017-12-04 17:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 17:13 [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings Leif Lindholm
2017-12-04 17:13 ` Leif Lindholm [this message]
2017-12-04 17:15 ` [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command Ard Biesheuvel
2017-12-04 17:17 ` Leif Lindholm
2017-12-04 17:27 ` Ard Biesheuvel
2017-12-04 17:28 ` Leif Lindholm
2017-12-04 17:14 ` [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171204171325.3359-2-leif.lindholm@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox