diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-28 11:08:21 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-28 11:08:21 -0500 |
| commit | ead47a75cf5b92145294a4cc9671a31b34116589 (patch) | |
| tree | 91a8f23b169ec7b89e1a748af7dee97bb147c71e /arch/arm/mach-mvebu | |
| parent | 80528e197e2924ba82c06f30a9928e93c4f16a33 (diff) | |
| parent | 4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff) | |
Merge tag 'kconfig-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/cleanup
Merge "kconfig clean-up and mach-virt removal for 3.15" from Rob Herring
- Remove common kconfig options required by multi-platform builds out
of individual platforms as they are redundant.
- Make SMP, CACHE_L2X0 and GPIO config options user visible on
multi-platform builds as most platforms enable these options and all
platforms can run with them enabled.
- Make multi-platform v6 default to more optimal v6k rather than v6
- Remove the last bit of mach-virt and convert it to just a kconfig
option.
* tag 'kconfig-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
ARM: virt: select ARM_AMBA
ARM: virt: make mach-virt just a kconfig option
ARM: vt8500: enable V6K instead of plain V6
ARM: cns3xxx: enable V6K instead of plain V6
ARM: bcm2835: enable V6K instead of plain V6
ARM: Select V6K instead of V6 by default for multi-platform
ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform
ARM: select HAVE_SMP for V7 multi-platform
ARM: centralize common multi-platform kconfig options
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 5e269d7263ce..875a35263dc3 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
| @@ -2,15 +2,10 @@ config ARCH_MVEBU | |||
| 2 | bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 | 2 | bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 |
| 3 | select ARCH_SUPPORTS_BIG_ENDIAN | 3 | select ARCH_SUPPORTS_BIG_ENDIAN |
| 4 | select CLKSRC_MMIO | 4 | select CLKSRC_MMIO |
| 5 | select COMMON_CLK | ||
| 6 | select GENERIC_CLOCKEVENTS | ||
| 7 | select GENERIC_IRQ_CHIP | 5 | select GENERIC_IRQ_CHIP |
| 8 | select IRQ_DOMAIN | 6 | select IRQ_DOMAIN |
| 9 | select MULTI_IRQ_HANDLER | ||
| 10 | select PINCTRL | 7 | select PINCTRL |
| 11 | select PLAT_ORION | 8 | select PLAT_ORION |
| 12 | select SPARSE_IRQ | ||
| 13 | select CLKDEV_LOOKUP | ||
| 14 | select MVEBU_MBUS | 9 | select MVEBU_MBUS |
| 15 | select ZONE_DMA if ARM_LPAE | 10 | select ZONE_DMA if ARM_LPAE |
| 16 | select ARCH_REQUIRE_GPIOLIB | 11 | select ARCH_REQUIRE_GPIOLIB |
| @@ -24,7 +19,6 @@ menu "Marvell SOC with device tree" | |||
| 24 | config MACH_ARMADA_370_XP | 19 | config MACH_ARMADA_370_XP |
| 25 | bool | 20 | bool |
| 26 | select ARMADA_370_XP_TIMER | 21 | select ARMADA_370_XP_TIMER |
| 27 | select HAVE_SMP | ||
| 28 | select CACHE_L2X0 | 22 | select CACHE_L2X0 |
| 29 | select CPU_PJ4B | 23 | select CPU_PJ4B |
| 30 | 24 | ||