* [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings
@ 2017-12-04 17:13 Leif Lindholm
2017-12-04 17:13 ` [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command Leif Lindholm
2017-12-04 17:14 ` [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings Ard Biesheuvel
0 siblings, 2 replies; 7+ messages in thread
From: Leif Lindholm @ 2017-12-04 17:13 UTC (permalink / raw)
To: edk2-devel; +Cc: ard.biesheuvel
Commit b324d85a466b,
("Hisilicon D03/D05: get firmware version from FIRMWARE_VER"),
added some non CRLF line endings, resolve this.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Platform/Hisilicon/D05/D05.dsc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index efd748e5ef..60eca3c6fc 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -181,11 +181,11 @@ [PcdsFixedAtBuild.common]
gHisiTokenSpaceGuid.PcdIsMPBoot|1
gHisiTokenSpaceGuid.PcdSocketMask|0x3
- !ifdef $(FIRMWARE_VER)
- gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
- !else
+ !ifdef $(FIRMWARE_VER)
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
+ !else
gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release"
- !endif
+ !endif
gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18"
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command
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
2017-12-04 17:15 ` Ard Biesheuvel
2017-12-04 17:14 ` [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings Ard Biesheuvel
1 sibling, 1 reply; 7+ messages in thread
From: Leif Lindholm @ 2017-12-04 17:13 UTC (permalink / raw)
To: edk2-devel; +Cc: ard.biesheuvel
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings
2017-12-04 17:13 [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings Leif Lindholm
2017-12-04 17:13 ` [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command Leif Lindholm
@ 2017-12-04 17:14 ` Ard Biesheuvel
1 sibling, 0 replies; 7+ messages in thread
From: Ard Biesheuvel @ 2017-12-04 17:14 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
On 4 December 2017 at 17:13, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Commit b324d85a466b,
> ("Hisilicon D03/D05: get firmware version from FIRMWARE_VER"),
> added some non CRLF line endings, resolve this.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> Platform/Hisilicon/D05/D05.dsc | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
> index efd748e5ef..60eca3c6fc 100644
> --- a/Platform/Hisilicon/D05/D05.dsc
> +++ b/Platform/Hisilicon/D05/D05.dsc
> @@ -181,11 +181,11 @@ [PcdsFixedAtBuild.common]
>
> gHisiTokenSpaceGuid.PcdIsMPBoot|1
> gHisiTokenSpaceGuid.PcdSocketMask|0x3
> - !ifdef $(FIRMWARE_VER)
> - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
> - !else
> + !ifdef $(FIRMWARE_VER)
> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"
> + !else
> gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release"
> - !endif
> + !endif
>
> gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18"
>
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command
2017-12-04 17:13 ` [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command Leif Lindholm
@ 2017-12-04 17:15 ` Ard Biesheuvel
2017-12-04 17:17 ` Leif Lindholm
0 siblings, 1 reply; 7+ messages in thread
From: Ard Biesheuvel @ 2017-12-04 17:15 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
On 4 December 2017 at 17:13, Leif Lindholm <leif.lindholm@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.lindholm@linaro.org>
Assuming that not defining the macro is the same as defining it to 0
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command
2017-12-04 17:15 ` Ard Biesheuvel
@ 2017-12-04 17:17 ` Leif Lindholm
2017-12-04 17:27 ` Ard Biesheuvel
2017-12-04 17:28 ` Leif Lindholm
0 siblings, 2 replies; 7+ messages in thread
From: Leif Lindholm @ 2017-12-04 17:17 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org
On Mon, Dec 04, 2017 at 05:15:35PM +0000, Ard Biesheuvel wrote:
> On 4 December 2017 at 17:13, Leif Lindholm <leif.lindholm@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.lindholm@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.biesheuvel@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
> >
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command
2017-12-04 17:17 ` Leif Lindholm
@ 2017-12-04 17:27 ` Ard Biesheuvel
2017-12-04 17:28 ` Leif Lindholm
1 sibling, 0 replies; 7+ messages in thread
From: Ard Biesheuvel @ 2017-12-04 17:27 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
On 4 December 2017 at 17:17, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Mon, Dec 04, 2017 at 05:15:35PM +0000, Ard Biesheuvel wrote:
>> On 4 December 2017 at 17:13, Leif Lindholm <leif.lindholm@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.lindholm@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 :)
>
Ah right. I missed that. So yes, please remove that.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command
2017-12-04 17:17 ` Leif Lindholm
2017-12-04 17:27 ` Ard Biesheuvel
@ 2017-12-04 17:28 ` Leif Lindholm
1 sibling, 0 replies; 7+ messages in thread
From: Leif Lindholm @ 2017-12-04 17:28 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org
On Mon, Dec 04, 2017 at 05:17:15PM +0000, 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 <leif.lindholm@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.lindholm@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 :)
(After confirming with Ard on IRC that the above was a resonable
explanation.)
Series pushed as 7511d626b3..84c212b1b4.
Thanks.
> > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@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
> > >
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-04 17:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-04 17:13 [PATCH edk2-platforms 1/2] Platform/Hisilicon: fix D05 .dsc line endings Leif Lindholm
2017-12-04 17:13 ` [PATCH edk2-platforms 2/2] Platform/Hisilicon: fix conditional inclusion of tftp shell command Leif Lindholm
2017-12-04 17:15 ` 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox