Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df0bcfe0 authored by Russell King's avatar Russell King
Browse files

Merge branch 'arm/common-kconfig-refactor+for-rmk' of... 

Merge branch 'arm/common-kconfig-refactor+for-rmk' of git://git.linaro.org/people/dmart/linux-2.6-arm into devel-stable
parents 215e83d9 a2075a7a

arch/arm/Kconfig

+22 −4
Original line number Diff line number Diff line
@@ -340,10 +340,12 @@ config ARCH_HIGHBANK 
	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select CACHE_L2X0

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU

	select HAVE_SMP

	select USE_OF

	help

	  Support for the Calxeda Highbank SoC based boards.
@@ -361,6 +363,7 @@ config ARCH_CNS3XXX 
	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select ARM_GIC

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help
@@ -381,6 +384,7 @@ config ARCH_PRIMA2 
	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	select ZONE_DMA

	help
@@ -633,6 +637,8 @@ config ARCH_TEGRA 
	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_HAS_CPUFREQ

	help

	  This enables support for NVIDIA Tegra based systems (Tegra APX,
@@ -702,7 +708,9 @@ config ARCH_SHMOBILE 
	select HAVE_CLK

	select CLKDEV_LOOKUP

	select HAVE_MACH_CLKDEV

	select HAVE_SMP

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select NO_IOPORT

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER
@@ -904,6 +912,8 @@ config ARCH_U8500 
	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Support for ST-Ericsson's Ux500 architecture
@@ -914,6 +924,7 @@ config ARCH_NOMADIK 
	select CPU_ARM926T

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_REQUIRE_GPIOLIB

	help

	  Support for the Nomadik platform by ST-Ericsson
@@ -973,6 +984,7 @@ config ARCH_ZYNQ 
	select ARM_GIC

	select ARM_AMBA

	select ICST

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	help

	  Support for Xilinx Zynq ARM Cortex A9 Platform
@@ -1434,14 +1446,20 @@ menu "Kernel Features" 


source "kernel/time/Kconfig"



config HAVE_SMP

	bool

	help

	  This option should be selected by machines which have an SMP-

	  capable CPU.



	  The only effect of this option is to make the SMP-related

	  options available to the user for configuration.



config SMP

	bool "Symmetric Multi-Processing"

	depends on CPU_V6K || CPU_V7

	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q

	depends on HAVE_SMP

	depends on MMU

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ choice 


config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Samsung EXYNOS4 SoCs based systems

arch/arm/mach-imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -596,12 +596,12 @@ comment "i.MX6 family:" 
config SOC_IMX6Q

	bool "i.MX6 Quad support"

	select ARM_GIC

	select CACHE_L2X0

	select CPU_V7

	select HAVE_ARM_SCU

	select HAVE_IMX_GPC

	select HAVE_IMX_MMDC

	select HAVE_IMX_SRC

	select HAVE_SMP

	select USE_OF



	help

arch/arm/mach-msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ config MSM_SOC_REV_A 
	bool

config  ARCH_MSM_SCORPIONMP

	bool

	select HAVE_SMP



config  ARCH_MSM_ARM11

	bool

arch/arm/mach-omap2/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -43,8 +43,10 @@ config ARCH_OMAP4 
	bool "TI OMAP4"

	default y

	depends on ARCH_OMAP2PLUS

	select CACHE_L2X0

	select CPU_V7

	select ARM_GIC

	select HAVE_SMP

	select LOCAL_TIMERS if SMP

	select PL310_ERRATA_588369

	select PL310_ERRATA_727915