Patchwork ARM: imx: only call l2x0_init if it's available

login
register
mail settings
Submitter Uwe Kleine-König
Date May 18, 2012, 2:58 p.m.
Message ID <1337353083-23019-1-git-send-email-u.kleine-koenig@pengutronix.de>
Download mbox | patch
Permalink /patch/160126/
State New
Headers show

Comments

Uwe Kleine-König - May 18, 2012, 2:58 p.m.
This fixes a build failure with CONFIG_CACHE_L2X0=n:

	arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0':
	imx53-dt.c:(.init.text+0x190): undefined reference to `l2x0_init'
	make[2]: *** [.tmp_vmlinux1] Error 1
	make[1]: *** [sub-make] Error 2
	make: *** [all] Error 2

When the l2 cache isn't enabled the quirk introduced in
9524705 (MX35: Fix bogus L2 cache settings) doesn't need to be done
either.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-imx/mm-imx3.c |    2 ++
 1 file changed, 2 insertions(+)
Sascha Hauer - May 29, 2012, 5:19 p.m.
On Fri, May 18, 2012 at 04:58:03PM +0200, Uwe Kleine-König wrote:
> This fixes a build failure with CONFIG_CACHE_L2X0=n:
> 
> 	arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0':
> 	imx53-dt.c:(.init.text+0x190): undefined reference to `l2x0_init'
> 	make[2]: *** [.tmp_vmlinux1] Error 1
> 	make[1]: *** [sub-make] Error 2
> 	make: *** [all] Error 2
> 
> When the l2 cache isn't enabled the quirk introduced in
> 9524705 (MX35: Fix bogus L2 cache settings) doesn't need to be done
> either.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-imx/mm-imx3.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
> index 7412738..6a80496 100644
> --- a/arch/arm/mach-imx/mm-imx3.c
> +++ b/arch/arm/mach-imx/mm-imx3.c
> @@ -81,6 +81,7 @@ static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size,
>  
>  void __init imx3_init_l2x0(void)
>  {
> +#ifdef CONFIG_CACHE_L2X0
>  	void __iomem *l2x0_base;
>  	void __iomem *clkctl_base;
>  
> @@ -110,6 +111,7 @@ void __init imx3_init_l2x0(void)
>  	}
>  
>  	l2x0_init(l2x0_base, 0x00030024, 0x00000000);
> +#endif
>  }
>  
>  #ifdef CONFIG_SOC_IMX31
> -- 
> 1.7.10
> 
>

Patch

diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
index 7412738..6a80496 100644
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@ -81,6 +81,7 @@  static void __iomem *imx3_ioremap_caller(unsigned long phys_addr, size_t size,
 
 void __init imx3_init_l2x0(void)
 {
+#ifdef CONFIG_CACHE_L2X0
 	void __iomem *l2x0_base;
 	void __iomem *clkctl_base;
 
@@ -110,6 +111,7 @@  void __init imx3_init_l2x0(void)
 	}
 
 	l2x0_init(l2x0_base, 0x00030024, 0x00000000);
+#endif
 }
 
 #ifdef CONFIG_SOC_IMX31