]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: imx: only call l2x0_init if it's available
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 18 May 2012 14:58:03 +0000 (16:58 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Tue, 29 May 2012 17:18:56 +0000 (19:18 +0200)
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/mm-imx3.c

index 74127389e7abe1b06ca648138137e79d0aa7b38f..6a80496d72dca76c5805b57ff2f0a2ca03e44c8f 100644 (file)
@@ -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