Przeglądaj źródła

arm: kconfig: enable SMP for MSM targets

This just adds ARCH_MSM_SCORPIONMP to allow SMP selection for
MSM. MSM is unique in that it doesn't enable SCU or TWD.

Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Daniel Walker 14 lat temu
rodzic
commit
89c3dedf47
2 zmienionych plików z 7 dodań i 4 usunięć
  1. 5 4
      arch/arm/Kconfig
  2. 2 0
      arch/arm/mach-msm/Kconfig

+ 5 - 4
arch/arm/Kconfig

@@ -1205,10 +1205,11 @@ config SMP
 	depends on EXPERIMENTAL
 	depends on EXPERIMENTAL
 	depends on GENERIC_CLOCKEVENTS
 	depends on GENERIC_CLOCKEVENTS
 	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
 	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
+		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
+		 ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
+		 ARCH_MSM_SCORPIONMP
 	select USE_GENERIC_SMP_HELPERS
 	select USE_GENERIC_SMP_HELPERS
-	select HAVE_ARM_SCU
+	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
 	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
@@ -1291,7 +1292,7 @@ config LOCAL_TIMERS
 	bool "Use local timer interrupts"
 	bool "Use local timer interrupts"
 	depends on SMP
 	depends on SMP
 	default y
 	default y
-	select HAVE_ARM_TWD
+	select HAVE_ARM_TWD if !ARCH_MSM_SCORPIONMP
 	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

+ 2 - 0
arch/arm/mach-msm/Kconfig

@@ -49,6 +49,8 @@ endchoice
 
 
 config MSM_SOC_REV_A
 config MSM_SOC_REV_A
 	bool
 	bool
+config  ARCH_MSM_SCORPIONMP
+	bool
 
 
 config  ARCH_MSM_ARM11
 config  ARCH_MSM_ARM11
 	bool
 	bool