diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2012-05-18 16:58:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-29 19:18:56 +0200 |
| commit | f90da3c7a52ac0c8f07f4d6cd0a7f7677e831916 (patch) | |
| tree | c7bdba72caafe864609c053b81887c25919c2cc6 /arch/arm/mach-imx/mm-imx3.c | |
| parent | 1064f8893ee1d16178d983928912057352362dc2 (diff) | |
| download | blackbird-op-linux-f90da3c7a52ac0c8f07f4d6cd0a7f7677e831916.tar.gz blackbird-op-linux-f90da3c7a52ac0c8f07f4d6cd0a7f7677e831916.zip | |
ARM: imx: only call l2x0_init if it's available
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>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index 74127389e7ab..6a80496d72dc 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 |
