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-zynq/Kconfig | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch/arm/mach-zynq') diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 6b04260aa142..85d180583402 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -2,16 +2,11 @@ config ARCH_ZYNQ bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7 select ARM_AMBA select ARM_GIC - select COMMON_CLK - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ICST select MIGHT_HAVE_CACHE_L2X0 - select USE_OF select HAVE_SMP - select SPARSE_IRQ select CADENCE_TTC_TIMER select ARM_GLOBAL_TIMER help -- 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-zynq/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-zynq') diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 85d180583402..70e247dd1f08 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -6,7 +6,6 @@ config ARCH_ZYNQ select HAVE_ARM_TWD if SMP select ICST select MIGHT_HAVE_CACHE_L2X0 - select HAVE_SMP select CADENCE_TTC_TIMER select ARM_GLOBAL_TIMER help -- 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-zynq/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-zynq') diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 70e247dd1f08..105d39b72a25 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -5,7 +5,6 @@ config ARCH_ZYNQ select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ICST - select MIGHT_HAVE_CACHE_L2X0 select CADENCE_TTC_TIMER select ARM_GLOBAL_TIMER help -- cgit v1.2.3