On Mon, Dec 04, 2017 at 05:15:35PM +0000, Ard Biesheuvel wrote: > On 4 December 2017 at 17:13, Leif Lindholm <leif.lindh...@linaro.org> 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 <leif.lindh...@linaro.org> > > 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 <ard.biesheu...@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 > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
