diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-02-28 17:08:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-02-28 17:08:21 +0100 |
| commit | ead47a75cf5b92145294a4cc9671a31b34116589 (patch) | |
| tree | 91a8f23b169ec7b89e1a748af7dee97bb147c71e /arch/arm/Makefile | |
| parent | 80528e197e2924ba82c06f30a9928e93c4f16a33 (diff) | |
| parent | 4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff) | |
| download | linux-ead47a75cf5b92145294a4cc9671a31b34116589.tar.gz linux-ead47a75cf5b92145294a4cc9671a31b34116589.tar.bz2 linux-ead47a75cf5b92145294a4cc9671a31b34116589.zip | |
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/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 51e5bede657f..dd1bd7ed77be 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -200,7 +200,6 @@ machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500 machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VEXPRESS) += vexpress -machine-$(CONFIG_ARCH_VIRT) += virt machine-$(CONFIG_ARCH_VT8500) += vt8500 machine-$(CONFIG_ARCH_W90X900) += w90x900 machine-$(CONFIG_ARCH_ZYNQ) += zynq |