[U-Boot] [PATCH 5/6] spl: Make CONFIG_SPL_BUILD contain more functionality

[Scott Wood]

On 05/24/2013 11:11:01 AM, Tom Rini wrote:
> On Mon, May 20, 2013 at 02:07:27PM +0800, ying.zhang at freescale.com  
> wrote:
> 
> > From: Ying Zhang <b40530 at freescale.com>
> >
> > There was some functionality will be used in the SPL. They
> > had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it
> > into the SPL.
> >
> > Signed-off-by: Ying Zhang <b40530 at freescale.com>
> > ---
> >  arch/powerpc/cpu/mpc85xx/tlb.c |    2 +-
> >  arch/powerpc/cpu/mpc8xxx/law.c |    4 ++--
> 
> In these cases can we not just always build them, aside from when
> CONFIG_NAND_SPL is set and rely on link-time discard here?  Otherwise:
> 
> 
> > -#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_BUILD)
> > +#if !defined(CONFIG_NAND_SPL) && !defined(CONFIG_SPL_NAND_MINIMAL)
> 
> Should become, I believe (and this isn't whitespaced properly):
> #if !defined(CONFIG_NAND_SPL) && !(defined(CONFIG_SPL_BUILD) &&
> defined(CONFIG_SPL_NAND_MINIMAL))
> 
> So that:
> 
> > diff --git a/include/configs/MPC8313ERDB.h  
> b/include/configs/MPC8313ERDB.h
> [snip]
> > diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
> [snip]
> > diff --git a/include/configs/p1_p2_rdb_pc.h  
> b/include/configs/p1_p2_rdb_pc.h
> 
> Can then all be dropped.

Possibly, but it would be nice to limit SPL symbols to only be defined  
for the SPL part of the build, so we don't have to add checks for  
CONFIG_SPL_BUILD all over the place.  Currently this won't work for  
symbols that makefiles look at, though there was a patch to fix that,  
which I referred to elsewhere in the these threads.

-Scott