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

Commit 971acb9b authored by Russell King's avatar Russell King
Browse files

ARM: Simplify SMP/SCU/TWD dependencies 



All platforms which currently support SMP also support the ARM SCU
and ARM TWD blocks, so it's pointless to make these config symbols
conditional on the platform symbols which SMP is already conditional
on.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 055d1965

arch/arm/Kconfig

+7 −10
Original line number Original line Diff line number Diff line
@@ -1167,13 +1167,13 @@ source "kernel/time/Kconfig" 




config SMP

config SMP

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	bool "Symmetric Multi-Processing (EXPERIMENTAL)"

	depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\

	depends on EXPERIMENTAL

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	depends on GENERIC_CLOCKEVENTS

	depends on GENERIC_CLOCKEVENTS

	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\

		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4

	select USE_GENERIC_SMP_HELPERS

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\

	select HAVE_ARM_SCU

		 ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4

	help

	help

	  This enables support for systems with more than one CPU. If you have

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, like most personal computers, say N. If

	  a system with only one CPU, like most personal computers, say N. If
@@ -1241,12 +1241,9 @@ config HOTPLUG_CPU 




config LOCAL_TIMERS

config LOCAL_TIMERS

	bool "Use local timer interrupts"

	bool "Use local timer interrupts"

	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \

	depends on SMP

		REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)

	default y

	default y

	select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \

	select HAVE_ARM_TWD

		ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS

	help

	help

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

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

	  legacy IPI broadcast method.  Local timers allows the system

	  legacy IPI broadcast method.  Local timers allows the system