summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm/Kconfig
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
commit62b8c978ee6b8d135d9e7953221de58000dba986 (patch)
tree683b04b2e627f6710c22c151b23c8cc9a165315e /arch/arm/mach-bcm/Kconfig
parent78fd82238d0e5716578c326404184a27ba67fd6e (diff)
downloadlinux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'arch/arm/mach-bcm/Kconfig')
-rw-r--r--arch/arm/mach-bcm/Kconfig22
1 files changed, 3 insertions, 19 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 9fe6d88..69d67f7 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -1,16 +1,5 @@
config ARCH_BCM
- bool "Broadcom SoC Support"
- depends on ARCH_MULTIPLATFORM
- help
- This enables support for Broadcom ARM based SoC
- chips
-
-if ARCH_BCM
-
-menu "Broadcom SoC Selection"
-
-config ARCH_BCM_MOBILE
- bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+ bool "Broadcom SoC" if ARCH_MULTI_V7
depends on MMU
select ARCH_REQUIRE_GPIOLIB
select ARM_ERRATA_754322
@@ -20,17 +9,12 @@ config ARCH_BCM_MOBILE
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select GENERIC_TIME
- select GPIO_BCM_KONA
+ select GPIO_BCM
select SPARSE_IRQ
select TICK_ONESHOT
select CACHE_L2X0
- select HAVE_ARM_ARCH_TIMER
help
- This enables support for systems based on Broadcom mobile SoCs.
+ This enables support for system based on Broadcom SoCs.
It currently supports the 'BCM281XX' family, which includes
BCM11130, BCM11140, BCM11351, BCM28145 and
BCM28155 variants.
-
-endmenu
-
-endif