From: Shawn Guo Date: Wed, 5 Mar 2014 02:31:54 +0000 (+0800) Subject: Merge tag 'kconfig-cleanup-for-3.15' into imx/soc X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c1b2a174c33ae2bd453e40199de4f93c684500e6;p=deliverable%2Flinux.git Merge tag 'kconfig-cleanup-for-3.15' into imx/soc - 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. Conflicts: arch/arm/mach-omap2/Kconfig --- c1b2a174c33ae2bd453e40199de4f93c684500e6 diff --cc arch/arm/mach-omap2/Kconfig index 0af7ca02314d,922cbd8e3519..eec053c62fa0 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@@ -50,13 -45,10 +45,11 @@@ config SOC_OMAP bool "TI OMAP5" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS + select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM select ARM_GIC - select CPU_V7 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select HAVE_ARM_ARCH_TIMER select ARM_ERRATA_798181 if SMP @@@ -64,18 -56,12 +57,14 @@@ config SOC_AM33X bool "TI AM33XX" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS + select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM - select CPU_V7 - select MULTI_IRQ_HANDLER config SOC_AM43XX bool "TI AM43x" depends on ARCH_MULTI_V7 - select CPU_V7 select ARCH_OMAP2PLUS + select ARCH_HAS_OPP - select MULTI_IRQ_HANDLER select ARM_GIC select MACH_OMAP_GENERIC @@@ -83,11 -69,8 +72,9 @@@ config SOC_DRA7X bool "TI DRA7XX" depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS + select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM select ARM_GIC - select CPU_V7 - select HAVE_SMP select HAVE_ARM_ARCH_TIMER config ARCH_OMAP2PLUS