[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Vidya Sagar]

u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries
are generated only if the SPL build is enabled as they have
dependency on SPL build

Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 1365db6..3c71082 100644
--- a/Makefile
+++ b/Makefile
@@ -407,12 +407,14 @@ endif
 
 # enable combined SPL/u-boot/dtb rules for tegra
 ifneq ($(CONFIG_TEGRA),)
+ifeq ($(CONFIG_SPL),y)
 ifeq ($(CONFIG_OF_SEPARATE),y)
 ALL-y += $(obj)u-boot-dtb-tegra.bin
 else
 ALL-y += $(obj)u-boot-nodtb-tegra.bin
 endif
 endif
+endif
 
 all:		$(ALL-y) $(SUBDIR_EXAMPLES)
 
-- 
1.8.1.5

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Tom Warren]

Vidya,

> -----Original Message-----
> From: Vidya Sagar [mailto:vidyas at nvidia.com]
> Sent: Thursday, October 31, 2013 2:22 AM
> To: u-boot at lists.denx.de
> Cc: Tom Warren; Stephen Warren; Vidya Sagar
> Subject: [PATCH] tegra: allow build to succeed with SPL disabled
> 
> u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries are generated
> only if the SPL build is enabled as they have dependency on SPL build
> 
> Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
> ---
>  Makefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile b/Makefile
> index 1365db6..3c71082 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -407,12 +407,14 @@ endif
> 
>  # enable combined SPL/u-boot/dtb rules for tegra  ifneq
> ($(CONFIG_TEGRA),)
> +ifeq ($(CONFIG_SPL),y)
>  ifeq ($(CONFIG_OF_SEPARATE),y)
>  ALL-y += $(obj)u-boot-dtb-tegra.bin
>  else
>  ALL-y += $(obj)u-boot-nodtb-tegra.bin
>  endif
>  endif
> +endif
> 
>  all:		$(ALL-y) $(SUBDIR_EXAMPLES)
> 
> --
> 1.8.1.5
LGTM, thanks.  I assume you built all Tegra boards using MAKEALL?

If so, then:
Acked-by: Tom Warren <twarren@nvidia.com>
--
nvpublic

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Stephen Warren]

On 10/31/2013 03:21 AM, Vidya Sagar wrote:
> u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries
> are generated only if the SPL build is enabled as they have
> dependency on SPL build

Should they though? If there's no SPL, surely we still want to generate
the same output filenames, so that consumers of the binaries don't have
to care whether a particular board needs the SPL tacked onto the binary.

In other words, rather than:

u-boot-nodtb-tegra.bin == SPL + U-Boot
u-boot-dtb-tegra.bin == SPL + U-Boot + DTB

... when SPL is disabled, shouldn't we generate:

u-boot-nodtb-tegra.bin == U-Boot
u-boot-dtb-tegra.bin == U-Boot + DTB

That would require modifying the rules that generate those files not to
include the SPL binary in the concatenation, rather than simply not
generating those files at all.

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Vidya Sagar]

On 10/31/2013 11:58 PM, wrote:
>
 > ________________________________________ From: Tom Warren Sent:
 > Thursday, October 31, 2013 9:38 PM To: Vidya Sagar;
 > u-boot at lists.denx.de Cc: Stephen Warren; Vidya Sagar; Tom Warren
 > Subject: RE: [PATCH] tegra: allow build to succeed with SPL disabled
 >
 > Vidya,
 >
 >> -----Original Message----- From: Vidya Sagar
 >> [mailto:vidyas at nvidia.com] Sent: Thursday, October 31, 2013 2:22
 >> AM To: u-boot at lists.denx.de Cc: Tom Warren; Stephen Warren; Vidya
 >> Sagar Subject: [PATCH] tegra: allow build to succeed with SPL
 >> disabled
 >>
 >> u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries are
 >> generated only if the SPL build is enabled as they have dependency
 >> on SPL build
 >>
 >> Signed-off-by: Vidya Sagar <vidyas@nvidia.com> --- Makefile | 2 ++
 >> 1 file changed, 2 insertions(+)
 >>
 >> diff --git a/Makefile b/Makefile index 1365db6..3c71082 100644 ---
 >> a/Makefile +++ b/Makefile @@ -407,12 +407,14 @@ endif
 >>
 >> # enable combined SPL/u-boot/dtb rules for tegra  ifneq
 >> ($(CONFIG_TEGRA),) +ifeq ($(CONFIG_SPL),y) ifeq
 >> ($(CONFIG_OF_SEPARATE),y) ALL-y += $(obj)u-boot-dtb-tegra.bin else
 >> ALL-y += $(obj)u-boot-nodtb-tegra.bin endif endif +endif
 >>
 >> all:         $(ALL-y) $(SUBDIR_EXAMPLES)
 >>
 >> -- 1.8.1.5
 > LGTM, thanks.  I assume you built all Tegra boards using MAKEALL?
 >
 > If so, then: Acked-by: Tom Warren <twarren@nvidia.com> -- nvpublic

yes, I've built for all nvidia boards.
Here is the log...

#./MAKEALL -v nvidia
Configuring for dalmore board...
    text       data        bss        dec        hex    filename
  256692      15308     309924     581924      8e124 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for harmony board...
    text       data        bss        dec        hex    filename
  295786      11870     311232     618888      97188 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for seaboard board...
    text       data        bss        dec        hex    filename
  310284      13450     309544     633278      9a9be 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for ventana board...
    text       data        bss        dec        hex    filename
  248990       7690     307820     564500      89d14 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for whistler board...
    text       data        bss        dec        hex    filename
  244038       9018     307768     560824      88eb8 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for beaver board...
    text       data        bss        dec        hex    filename
  255926      16672     308676     581274      8de9a 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for cardhu board...
    text       data        bss        dec        hex    filename
  255926      16672     308676     581274      8de9a 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot

--------------------- SUMMARY ----------------------------
Boards compiled: 7
----------------------------------------------------------

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Vidya Sagar]

On 10/31/2013 11:58 PM, wrote:
> ________________________________________
> From: Tom Warren
> Sent: Thursday, October 31, 2013 9:38 PM
> To: Vidya Sagar;u-boot at lists.denx.de
> Cc: Stephen Warren; Vidya Sagar; Tom Warren
> Subject: RE: [PATCH] tegra: allow build to succeed with SPL disabled
>
> Vidya,
>
>> -----Original Message-----
>> From: Vidya Sagar [mailto:vidyas at nvidia.com]
>> Sent: Thursday, October 31, 2013 2:22 AM
>> To:u-boot at lists.denx.de
>> Cc: Tom Warren; Stephen Warren; Vidya Sagar
>> Subject: [PATCH] tegra: allow build to succeed with SPL disabled
>>
>> u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries are generated
>> only if the SPL build is enabled as they have dependency on SPL build
>>
>> Signed-off-by: Vidya Sagar<vidyas@nvidia.com>
>> ---
>>   Makefile | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/Makefile b/Makefile
>> index 1365db6..3c71082 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -407,12 +407,14 @@ endif
>>
>>   # enable combined SPL/u-boot/dtb rules for tegra  ifneq
>> ($(CONFIG_TEGRA),)
>> +ifeq ($(CONFIG_SPL),y)
>>   ifeq ($(CONFIG_OF_SEPARATE),y)
>>   ALL-y += $(obj)u-boot-dtb-tegra.bin
>>   else
>>   ALL-y += $(obj)u-boot-nodtb-tegra.bin
>>   endif
>>   endif
>> +endif
>>
>>   all:         $(ALL-y) $(SUBDIR_EXAMPLES)
>>
>> --
>> 1.8.1.5
> LGTM, thanks.  I assume you built all Tegra boards using MAKEALL?
>
> If so, then:
> Acked-by: Tom Warren<twarren@nvidia.com>
> --
> nvpublic

yes, I've built for all nvidia boards.
Here is the log...

#./MAKEALL -v nvidia
Configuring for dalmore board...
    text       data        bss        dec        hex    filename
  256692      15308     309924     581924      8e124 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for harmony board...
    text       data        bss        dec        hex    filename
  295786      11870     311232     618888      97188 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for seaboard board...
    text       data        bss        dec        hex    filename
  310284      13450     309544     633278      9a9be 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for ventana board...
    text       data        bss        dec        hex    filename
  248990       7690     307820     564500      89d14 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for whistler board...
    text       data        bss        dec        hex    filename
  244038       9018     307768     560824      88eb8 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for beaver board...
    text       data        bss        dec        hex    filename
  255926      16672     308676     581274      8de9a 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot
Configuring for cardhu board...
    text       data        bss        dec        hex    filename
  255926      16672     308676     581274      8de9a 
/home/vidyas/x/uboot/for_upstreaming/u-boot-tegra/../out/u-boot

--------------------- SUMMARY ----------------------------
Boards compiled: 7
----------------------------------------------------------

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Vidya Sagar]

> -----Original Message-----
> From: Tom Warren
> Sent: Thursday, October 31, 2013 9:38 PM
> To: Vidya Sagar; u-boot at lists.denx.de
> Cc: Stephen Warren; Vidya Sagar; Tom Warren
> Subject: RE: [PATCH] tegra: allow build to succeed with SPL disabled
> 
> Vidya,
> 
> > -----Original Message-----
> > From: Vidya Sagar [mailto:vidyas at nvidia.com]
> > Sent: Thursday, October 31, 2013 2:22 AM
> > To: u-boot at lists.denx.de
> > Cc: Tom Warren; Stephen Warren; Vidya Sagar
> > Subject: [PATCH] tegra: allow build to succeed with SPL disabled
> >
> > u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries are generated
> > only if the SPL build is enabled as they have dependency on SPL build
> >
> > Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
> > ---
> >  Makefile | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/Makefile b/Makefile
> > index 1365db6..3c71082 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -407,12 +407,14 @@ endif
> >
> >  # enable combined SPL/u-boot/dtb rules for tegra  ifneq
> > ($(CONFIG_TEGRA),)
> > +ifeq ($(CONFIG_SPL),y)
> >  ifeq ($(CONFIG_OF_SEPARATE),y)
> >  ALL-y += $(obj)u-boot-dtb-tegra.bin
> >  else
> >  ALL-y += $(obj)u-boot-nodtb-tegra.bin  endif  endif
> > +endif
> >
> >  all:		$(ALL-y) $(SUBDIR_EXAMPLES)
> >
> > --
> > 1.8.1.5
> LGTM, thanks.  I assume you built all Tegra boards using MAKEALL?
> 
> If so, then:
> Acked-by: Tom Warren <twarren@nvidia.com>
> --
> nvpublic

I've run "./MAKEALL -v nvidia" and didn't see any issue.

--
nvpublic

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Vidya Sagar]

> -----Original Message-----
> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
> Sent: Thursday, October 31, 2013 9:59 PM
> To: Vidya Sagar; u-boot at lists.denx.de
> Cc: Stephen Warren; Tom Warren
> Subject: Re: [U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled
> 
> On 10/31/2013 03:21 AM, Vidya Sagar wrote:
> > u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries are generated
> > only if the SPL build is enabled as they have dependency on SPL build
> 
> Should they though? If there's no SPL, surely we still want to generate the
> same output filenames, so that consumers of the binaries don't have to care
> whether a particular board needs the SPL tacked onto the binary.
> 
> In other words, rather than:
> 
> u-boot-nodtb-tegra.bin == SPL + U-Boot
> u-boot-dtb-tegra.bin == SPL + U-Boot + DTB
> 
> ... when SPL is disabled, shouldn't we generate:
> 
> u-boot-nodtb-tegra.bin == U-Boot
> u-boot-dtb-tegra.bin == U-Boot + DTB
> 
> That would require modifying the rules that generate those files not to
> include the SPL binary in the concatenation, rather than simply not
> generating those files at all.

When the SPL build is disabled, we are already generating u-boot.bin and u-boot-dtb.bin.
Do we really want to generate two more binaries with the same content but with different names ?

--
nvpublic

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Stephen Warren]

On 11/01/2013 11:27 AM, Vidya Sagar wrote:
>Tom Warren wrote at Thursday, October 31, 2013 9:38 PM:
>> If so, then:
>> Acked-by: Tom Warren <twarren@nvidia.com>
>> --
>> nvpublic
> 
> I've run "./MAKEALL -v nvidia" and didn't see any issue.

You want "./MAKEALL -s tegra", since not all Tegra boards were created
by NVIDIA; quite a few come from other vendors.

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Stephen Warren]

On 11/01/2013 11:29 AM, Vidya Sagar wrote:
> 
> 
>> -----Original Message-----
>> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
>> Sent: Thursday, October 31, 2013 9:59 PM
>> To: Vidya Sagar; u-boot at lists.denx.de
>> Cc: Stephen Warren; Tom Warren
>> Subject: Re: [U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled
>>
>> On 10/31/2013 03:21 AM, Vidya Sagar wrote:
>>> u-boot-dtb-tegra.bin and u-boot-nodtb-tegra.bin binaries are generated
>>> only if the SPL build is enabled as they have dependency on SPL build
>>
>> Should they though? If there's no SPL, surely we still want to generate the
>> same output filenames, so that consumers of the binaries don't have to care
>> whether a particular board needs the SPL tacked onto the binary.
>>
>> In other words, rather than:
>>
>> u-boot-nodtb-tegra.bin == SPL + U-Boot
>> u-boot-dtb-tegra.bin == SPL + U-Boot + DTB
>>
>> ... when SPL is disabled, shouldn't we generate:
>>
>> u-boot-nodtb-tegra.bin == U-Boot
>> u-boot-dtb-tegra.bin == U-Boot + DTB
>>
>> That would require modifying the rules that generate those files not to
>> include the SPL binary in the concatenation, rather than simply not
>> generating those files at all.
> 
> When the SPL build is disabled, we are already generating u-boot.bin and u-boot-dtb.bin.
> Do we really want to generate two more binaries with the same content but with different names ?

Oh, I guess that the way u-boot-tegra-*.bin is a bit different to what I
thought, so indeed if you just disable those, then the desired
U-Boot+DTB files are still created. So, I guess it's fine the way you
have it.

It's a bit annoying that the output filenames are different based on
whether you have SPL or not, but I guess I can make our flasher scripts
cope with that easily enough.

[U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled

[Vidya Sagar]

> -----Original Message-----
> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
> Sent: Friday, November 01, 2013 11:05 PM
> To: Vidya Sagar; Tom Warren; u-boot at lists.denx.de
> Cc: Tom Warren; Stephen Warren
> Subject: Re: [U-Boot] [PATCH] tegra: allow build to succeed with SPL disabled
> 
> On 11/01/2013 11:27 AM, Vidya Sagar wrote:
> >Tom Warren wrote at Thursday, October 31, 2013 9:38 PM:
> >> If so, then:
> >> Acked-by: Tom Warren <twarren@nvidia.com>
> >> --
> >> nvpublic
> >
> > I've run "./MAKEALL -v nvidia" and didn't see any issue.
> 
> You want "./MAKEALL -s tegra", since not all Tegra boards were created by
> NVIDIA; quite a few come from other vendors.

just now gave a try. Total number of boards compiled are 13 and didn't see any issue.

--
nvpublic