summary refs log tree commit diff
path: root/arch/arm/mach-realview
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-31 23:51:02 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-31 23:52:20 +0100
commit2cb58c016673c4c8b8ec59e71c5ec4b2c6a76afb (patch)
treef014f822373810a3e549b7daed75edc79b4ac475 /arch/arm/mach-realview
parent26922c59092c451f9888d0f1d1d72ebdafdc2628 (diff)
downloadlinux-2cb58c016673c4c8b8ec59e71c5ec4b2c6a76afb.tar.gz
ARM: realview: don't select SMP_ON_UP for UP builds
When CONFIG_SMP is disabled, we get a warning from Kconfig:

warning: (SOC_IMX31 && SOC_IMX35 && SOC_VF610 && REALVIEW_DT) selects SMP_ON_UP which has unmet direct dependencies (SMP && !XIP_KERNEL && MMU)

This changes the REALVIEW_DT Kconfig entry to not select SMP_ON_UP
unless SMP is also set.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r--arch/arm/mach-realview/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 9e01e42bf267..def40a0dd60c 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -23,7 +23,7 @@ config REALVIEW_DT
 	select POWER_RESET
 	select POWER_RESET_VERSATILE
 	select POWER_SUPPLY
-	select SMP_ON_UP
+	select SMP_ON_UP if SMP
 	select SOC_REALVIEW
 	select USE_OF
 	help