> On Saturday 14 January 2012 21:12:00 Marek Vasut wrote:
> > > * This patch fix compile warnings when CONFIG_SYS_L2CACHE_OFF is
> > > enabled
> > >
> > > board.c:48:13: warning: ‘omap3_invalidate_l2_cache_secure’ declared
> > >
> > > ‘static’ but never defined board.c:373:13: warning:
> > > ‘omap3_update_aux_cr’ defined but not used
> > >
> > > Signed-off-by: Pali Rohár <pali.ro...@gmail.com>
> > > ---
> > >
> > > arch/arm/cpu/armv7/omap3/board.c | 5 +++++
> > > 1 files changed, 5 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/arch/arm/cpu/armv7/omap3/board.c
> > > b/arch/arm/cpu/armv7/omap3/board.c index 1f33c63..52514ae 100644
> > > --- a/arch/arm/cpu/armv7/omap3/board.c
> > > +++ b/arch/arm/cpu/armv7/omap3/board.c
> > > @@ -45,7 +45,10 @@
> > >
> > > /* Declarations */
> > > extern omap3_sysinfo sysinfo;
> > > static void omap3_setup_aux_cr(void);
> > >
> > > +
> > > +#ifndef CONFIG_SYS_L2CACHE_OFF
> > >
> > > static void omap3_invalidate_l2_cache_secure(void);
> > >
> > > +#endif
> >
> > This is due to the ordering, right ? Now, split this into two patches,
> > because you're actually doing two unrelated things.
>
> No, function omap3_invalidate_l2_cache_secure is defined in block #ifndef
> CONFIG_SYS_L2CACHE_OFF. So declaration should be in #ifndef too.
Well ... I didn't object to that. I was just pointing out you're fixing forward
declaration to undefined function. You should make a separate patch for that
and
explain it in the changelog so it's easily bisectable.
>
> > > static const struct gpio_bank gpio_bank_34xx[6] = {
> > >
> > > { (void *)OMAP34XX_GPIO1_BASE, METHOD_GPIO_24XX },
> > >
> > > @@ -370,6 +373,7 @@ static void omap3_update_aux_cr_secure(u32
> > > set_bits, u32 clear_bits) }
> > >
> > > }
> > >
> > > +#ifndef CONFIG_SYS_L2CACHE_OFF
> > >
> > > static void omap3_update_aux_cr(u32 set_bits, u32 clear_bits)
> > > {
> > >
> > > u32 acr;
> > >
> > > @@ -382,6 +386,7 @@ static void omap3_update_aux_cr(u32 set_bits, u32
> > > clear_bits) /* Write ACR - affects non-secure banked bits */
> > >
> > > asm volatile ("mcr p15, 0, %0, c1, c0, 1" : : "r" (acr));
> > >
> > > }
> > >
> > > +#endif
> >
> > Just move this function a few lines below instead of adding more CPP
> > bloat.
>
> Function omap3_update_aux_cr is called only when CONFIG_SYS_L2CACHE_OFF is
> not defined, so adding #ifndef is needed.
Sigh ... move this function to the whole #ifndef block a few lines under that
function.
>
> > > static void omap3_setup_aux_cr(void)
> > > {
> >
> > Also, does this manifest on omap4 too?
> >
> > M
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
