From ddb902cc34593ecb88c368f6e15db3cf829c56fe Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 22 Nov 2013 09:29:37 -0600 Subject: 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 Acked-by: Linus Walleij Cc: Russell King Acked-by: Stephen Warren Tested-by: Stephen Warren Acked-by: Arnd Bergmann --- arch/arm/mach-imx/Kconfig | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'arch/arm/mach-imx') diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 33567aa5880f..3dd2c601fea2 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -2,18 +2,12 @@ config ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 select ARCH_REQUIRE_GPIOLIB select ARM_CPU_SUSPEND if PM - select ARM_PATCH_PHYS_VIRT select CLKSRC_MMIO - select COMMON_CLK select GENERIC_ALLOCATOR - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 - select MULTI_IRQ_HANDLER select PINCTRL select SOC_BUS - select SPARSE_IRQ - select USE_OF help Support for Freescale MXC/iMX-based family of processors @@ -132,7 +126,6 @@ config SOC_IMX5 select ARCH_HAS_CPUFREQ select ARCH_HAS_OPP select ARCH_MXC_IOMUX_V3 - select CPU_V7 select MXC_TZIC config SOC_IMX51 @@ -792,7 +785,6 @@ config SOC_IMX6Q select ARM_ERRATA_764369 if SMP select ARM_ERRATA_775420 select ARM_GIC - select CPU_V7 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_IMX_ANATOP @@ -817,7 +809,6 @@ config SOC_IMX6SL select ARM_ERRATA_754322 select ARM_ERRATA_775420 select ARM_GIC - select CPU_V7 select HAVE_IMX_ANATOP select HAVE_IMX_GPC select HAVE_IMX_MMDC @@ -833,9 +824,7 @@ config SOC_IMX6SL config SOC_VF610 bool "Vybrid Family VF610 support" - select CPU_V7 select ARM_GIC - select CLKSRC_OF select PINCTRL_VF610 select VF_PIT_TIMER select PL310_ERRATA_588369 if CACHE_PL310 -- cgit v1.2.3 From 90bc8ac77dc85d2184da3d5280215b33253adffc Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 31 Jan 2014 15:32:02 -0600 Subject: ARM: select HAVE_SMP for V7 multi-platform All V7 platforms can run SMP kernels, so make CONFIG_SMP visible for V7 multi-platform builds. Signed-off-by: Rob Herring Acked-by: Stephen Warren Acked-by: Arnd Bergmann --- arch/arm/mach-imx/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-imx') diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 3dd2c601fea2..1a6a843aad66 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -791,7 +791,6 @@ config SOC_IMX6Q select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC - select HAVE_SMP select MFD_SYSCON select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI -- cgit v1.2.3 From 9352b05b6e4ef1aae53744cbd0adc0491fae5be0 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 31 Jan 2014 15:36:10 -0600 Subject: ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform Many V6 and V7 platforms have an L2x0 cache, so make CONFIG_MIGHT_HAVE_CACHE_L2X0 visible for V6 and V7 multi-platform builds. Signed-off-by: Rob Herring Acked-by: Stephen Warren Acked-by: Arnd Bergmann --- arch/arm/mach-imx/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-imx') diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1a6a843aad66..ff2447389f27 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -5,7 +5,6 @@ config ARCH_MXC select CLKSRC_MMIO select GENERIC_ALLOCATOR select GENERIC_IRQ_CHIP - select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 select PINCTRL select SOC_BUS help -- cgit v1.2.3 From 42f4754a0c5fa0d1caeca77e29ad4e09b0762e72 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 31 Jan 2014 14:26:04 -0600 Subject: ARM: Select V6K instead of V6 by default for multi-platform MULTI_V6 should default to V6K as it is more optimal than V6. Any platform which is not V6K should select CPU_V6 which will enable the less optimal code paths. Signed-off-by: Rob Herring Cc: Anton Vorontsov Acked-by: Shawn Guo Cc: Sascha Hauer Cc: Jamie Iles Acked-by: Arnd Bergmann --- arch/arm/mach-imx/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-imx') diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ff2447389f27..41ffd433f709 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -114,7 +114,6 @@ config SOC_IMX31 config SOC_IMX35 bool select ARCH_MXC_IOMUX_V3 - select CPU_V6K select HAVE_EPIT select MXC_AVIC select SMP_ON_UP if SMP -- cgit v1.2.3