summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-05-24 00:28:55 +0200
committerArnd Bergmann <arnd@arndb.de>2014-05-24 00:29:10 +0200
commitc40f01287b3369638c9cb145298a79cc7103f696 (patch)
tree65568873d4d71c04882aafd880947c3302a3c08f /arch/arm/mach-bcm/Kconfig
parent28d1079c9cc7dd37ce9397d559b5ceef8a66b1db (diff)
parenteeda4cb92ee0fb63a5917738e107b0bc8168079e (diff)
downloadlinux-c40f01287b3369638c9cb145298a79cc7103f696.tar.bz2
Merge tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm into next/cleanup
* Clean up mach-bcm config and build targets * Clean up bcm281xx/21664 SMC code * Clean up bcm281xx/21664 L2C code * tag 'for-3.16/bcm-cleanup' of git://github.com/broadcom/mach-bcm: ARM: bcm: rename "kona.h" and "kona.c" ARM: bcm: rewrite commentary for bcm_kona_do_smc() ARM: bcm: use inline assembly for "smc" request ARM: bcm: tidy up a few includes ARM: bcm: config option for l2 cache support ARM: bcm: don't special-case CPU 0 in bcm_kona_smc() ARM: bcm: have bcm_kona_smc() return request result ARM: bcm: clean up SMC code ARM: bcm: err, don't BUG() on SMC init failures ARM: bcm: use memory accessors for ioremapped area ARM: bcm: clean up config and build targets Signed-off-by: Arnd Bergmann <arnd@arndb.de> Conflicts: arch/arm/mach-bcm/Kconfig
Diffstat (limited to 'arch/arm/mach-bcm/Kconfig')
-rw-r--r--arch/arm/mach-bcm/Kconfig40
1 files changed, 35 insertions, 5 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 9f19636fea2f..b8cc9e8992f1 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -10,21 +10,51 @@ if ARCH_BCM
menu "Broadcom SoC Selection"
config ARCH_BCM_MOBILE
- bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+ bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP
select ARM_GIC
select GPIO_BCM_KONA
select TICK_ONESHOT
- select CACHE_L2X0
select HAVE_ARM_ARCH_TIMER
select PINCTRL
help
This enables support for systems based on Broadcom mobile SoCs.
- It currently supports the 'BCM281XX' family, which includes
- BCM11130, BCM11140, BCM11351, BCM28145 and
- BCM28155 variants.
+
+if ARCH_BCM_MOBILE
+
+menu "Broadcom Mobile SoC Selection"
+
+config ARCH_BCM_281XX
+ bool "Broadcom BCM281XX SoC family"
+ default y
+ help
+ Enable support for the the BCM281XX family, which includes
+ BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155
+ variants.
+
+config ARCH_BCM_21664
+ bool "Broadcom BCM21664 SoC family"
+ default y
+ help
+ Enable support for the the BCM21664 family, which includes
+ BCM21663 and BCM21664 variants.
+
+config ARCH_BCM_MOBILE_L2_CACHE
+ bool "Broadcom mobile SoC level 2 cache support"
+ depends on (ARCH_BCM_281XX || ARCH_BCM_21664)
+ default y
+ select CACHE_L2X0
+ select ARCH_BCM_MOBILE_SMC
+
+config ARCH_BCM_MOBILE_SMC
+ bool
+ depends on ARCH_BCM_281XX || ARCH_BCM_21664
+
+endmenu
+
+endif
config ARCH_BCM2835
bool "Broadcom BCM2835 family" if ARCH_MULTI_V6