diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-06-06 09:38:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-17 17:09:14 +0200 |
| commit | 2ad501cc1d1062ac2cfd633e915f5aecda1a400f (patch) | |
| tree | 69a17a95c79ba4428ade67d9c740f2a74979adbd /arch/arm/configs | |
| parent | 2dc24b0d0636349d403ae803bbad0c84f6c2ea57 (diff) | |
ARM: omap2: fix am43xx dependency on l2x0 cache
Commit d941f86fad41b ("ARM: l2c: AM43x: add L2 cache support") enabled
the L2 cache support for the am43xx SoC, but caused a build regression
when the driver for that cache controller is disabled:
arch/arm/mach-omap2/built-in.o: In function `am43xx_init_early':
:(.init.text+0xb20): undefined reference to `omap_l2_cache_init'
This did not happen for OMAP4, which has the same call, but enables
the l2x0 driver unconditionally. We could do the same thing for
am43xx, but it seems better to allow turning it off and make the
code work in either case.
This adds an inline wrapper for omap_l2_cache_init for the disabled
case, and removes the 'select' from OMAP4 so it becomes a user
visible option.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 59066cf0271..536a137863c 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -32,6 +32,7 @@ CONFIG_SOC_OMAP5=y CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_SOC_DRA7XX=y +CONFIG_CACHE_L2X0=y CONFIG_ARM_THUMBEE=y CONFIG_ARM_ERRATA_411920=y CONFIG_SMP=y |