diff options
author | Rob Herring <robh@kernel.org> | 2013-11-22 10:29:37 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-02-19 17:38:18 -0500 |
commit | ddb902cc34593ecb88c368f6e15db3cf829c56fe (patch) | |
tree | 511b5a29ce6bc0ed6df36dc1271131660ab12b2f /arch/arm/mach-berlin | |
parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) |
ARM: centralize common multi-platform kconfig options
Multi-platform requires various kconfig options to be selected, so
platforms don't need to select them individually.
Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-berlin')
-rw-r--r-- | arch/arm/mach-berlin/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 7a02d222c378..b346f598a595 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig | |||
@@ -1,9 +1,7 @@ | |||
1 | config ARCH_BERLIN | 1 | config ARCH_BERLIN |
2 | bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 | 2 | bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 |
3 | select ARM_GIC | 3 | select ARM_GIC |
4 | select GENERIC_CLOCKEVENTS | ||
5 | select GENERIC_IRQ_CHIP | 4 | select GENERIC_IRQ_CHIP |
6 | select COMMON_CLK | ||
7 | select DW_APB_ICTL | 5 | select DW_APB_ICTL |
8 | select DW_APB_TIMER_OF | 6 | select DW_APB_TIMER_OF |
9 | 7 | ||
@@ -21,7 +19,6 @@ config MACH_BERLIN_BG2 | |||
21 | config MACH_BERLIN_BG2CD | 19 | config MACH_BERLIN_BG2CD |
22 | bool "Marvell Armada 1500-mini (BG2CD)" | 20 | bool "Marvell Armada 1500-mini (BG2CD)" |
23 | select CACHE_L2X0 | 21 | select CACHE_L2X0 |
24 | select CPU_V7 | ||
25 | select HAVE_ARM_TWD if SMP | 22 | select HAVE_ARM_TWD if SMP |
26 | 23 | ||
27 | endmenu | 24 | endmenu |