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

Commit 4c3ffffd authored by Stephen Boyd's avatar Stephen Boyd Committed by Arnd Bergmann
Browse files

ARM: Push selects for TWD/SCU into machine entries 



The TWD and SCU configs are selected by default as long as
MSM_SCORPIONMP is false and/or MCT is false. Implementing the
logic this way certainly saves lines in the Kconfig but it
precludes those machines which select MSM_SCORPIONMP or MCT from
participating in the single zImage effort because when those
machines are combined with other SMP capable machines the TWD and
SCU are no longer selected by default.

Push the select out to the machine entries so that we can compile
these machines together and still select the appropriate configs.

Cc: Barry Song <baohua.song@csr.com>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: default avatarViresh Kumar <viresh.linux@gmail.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 494cc760

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -637,6 +637,8 @@ config ARCH_SHMOBILE 
	bool "Renesas SH-Mobile / R-Mobile"

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if LOCAL_TIMERS

	select HAVE_CLK

	select HAVE_MACH_CLKDEV

	select HAVE_SMP
@@ -1400,7 +1402,6 @@ config SMP 
	depends on GENERIC_CLOCKEVENTS

	depends on HAVE_SMP

	depends on MMU

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

	select USE_GENERIC_SMP_HELPERS

	help

	  This enables support for systems with more than one CPU. If you have
@@ -1525,7 +1526,6 @@ config LOCAL_TIMERS 
	bool "Use local timer interrupts"

	depends on SMP

	default y

	select HAVE_ARM_TWD if (!ARCH_MSM_SCORPIONMP && !EXYNOS4_MCT)

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ menu "SAMSUNG EXYNOS SoCs Support" 
config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	default y

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help
@@ -21,6 +22,7 @@ config ARCH_EXYNOS4 


config ARCH_EXYNOS5

	bool "SAMSUNG EXYNOS5"

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	help

	  Samsung EXYNOS5 (Cortex-A15) SoC based systems

arch/arm/mach-highbank/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config ARCH_HIGHBANK 
	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU

	select HAVE_ARM_TWD if LOCAL_TIMERS

	select HAVE_SMP

	select MAILBOX

	select PL320_MBOX

arch/arm/mach-imx/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -811,7 +811,8 @@ config SOC_IMX6Q 
	select ARM_GIC

	select COMMON_CLK

	select CPU_V7

	select HAVE_ARM_SCU

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if LOCAL_TIMERS

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_IMX_GPC

	select HAVE_IMX_MMDC

arch/arm/mach-msm/Kconfig

+2 −5
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ endchoice 


config ARCH_MSM8X60

	bool "MSM8X60"

	select ARCH_MSM_SCORPIONMP

	select ARM_GIC

	select CPU_V7

	select GPIO_MSM_V2

	select HAVE_SMP

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select MSM_V2_TLMM
@@ -55,9 +55,9 @@ config ARCH_MSM8X60 


config ARCH_MSM8960

	bool "MSM8960"

	select ARCH_MSM_SCORPIONMP

	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select MSM_GPIOMUX

	select MSM_SCM if SMP

	select MSM_V2_TLMM
@@ -68,9 +68,6 @@ config MSM_HAS_DEBUG_UART_HS 


config MSM_SOC_REV_A

	bool

config  ARCH_MSM_SCORPIONMP

	bool

	select HAVE_SMP



config  ARCH_MSM_ARM11

	bool