summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm/Makefile
diff options
context:
space:
mode:
authorAlex Elder <elder@linaro.org>2014-04-21 16:53:07 -0500
committerMatt Porter <mporter@linaro.org>2014-04-25 08:51:35 -0400
commit7b5fe9c9115c92b7e6297216c789268961a19f98 (patch)
treea4e2ad11e094d067e9cc80f67440a29023a20608 /arch/arm/mach-bcm/Makefile
parent35138d52f18c3f757f12d54c0962a755bcf218f3 (diff)
downloadtalos-obmc-linux-7b5fe9c9115c92b7e6297216c789268961a19f98.tar.gz
talos-obmc-linux-7b5fe9c9115c92b7e6297216c789268961a19f98.zip
ARM: bcm: config option for l2 cache support
Add a new config option ARCH_BCM_MOBILE_L2_CACHE that allows support for level-2 cache to be enabled or disabled at build time for BCM218XX and BCM21664 family SoCs. Build support for SMC only if it's required (currently it's only required for to support level 2 cache control). If arch/arm/mach-bcm/kona.c gets compiled, ARCH_BCM_MOBILE_L2_CACHE must have been selected, which implies CONFIG_CACHE_L2X0 is set. There is therefore no need to check CONFIG_CACHE_L2X0 at the top of kona_l2_cache_init(), so get rid of that check. Signed-off-by: Alex Elder <elder@linaro.org> Reviewed-by: Tim Kryger <tim.kryger@linaro.org> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Reviewed-by: Matt Porter <mporter@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
Diffstat (limited to 'arch/arm/mach-bcm/Makefile')
-rw-r--r--arch/arm/mach-bcm/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 7fb9b0402204..51549814f7cd 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -17,7 +17,10 @@ obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o
obj-$(CONFIG_ARCH_BCM_21664) += board_bcm21664.o
# BCM281XX and BCM21664 L2 cache control
-obj-$(CONFIG_ARCH_BCM_MOBILE) += bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
+obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona.o
+
+# Support for secure monitor traps
+obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o bcm_kona_smc_asm.o
plus_sec := $(call as-instr,.arch_extension sec,+sec)
AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec)
OpenPOWER on IntegriCloud