diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2017-12-04 16:59:28 +0000 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2017-12-04 17:17:45 +0000 |
| commit | 84c212b1b4555922c9f1fbdb2f74447cdbe90f81 (patch) | |
| tree | 6d55b4f7efaf192ffce2b8ef7c553025daa3f6ea | |
| parent | 03e74bea033f4611ef7bf2ec11ce6e031a6d3bce (diff) | |
| download | edk2-platforms-84c212b1b4555922c9f1fbdb2f74447cdbe90f81.tar.xz | |
Platform/Hisilicon: fix conditional inclusion of tftp shell command
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>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
| -rw-r--r-- | Platform/Hisilicon/D02/Pv660D02.dsc | 1 | ||||
| -rw-r--r-- | Platform/Hisilicon/D03/D03.dsc | 1 | ||||
| -rw-r--r-- | Platform/Hisilicon/D05/D05.dsc | 1 |
3 files changed, 0 insertions, 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 @@ 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 @@ 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 @@ 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
|