summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2016-01-21 15:26:49 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-09 10:39:18 +0100
commit89bf707923ec708b88b44b26bc439b1c188b38da (patch)
tree902728119ded624ea8874c6b228470d7025602d1
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
ARM: realview: activate SMP on the default defconfig
The realview has two defconfigs: realview_defconfig and realview-smp_defconfig. We now have working SMP_ON_UP so make them equal so we can delete the -smp variant. For some reason NO_HZ_FULL was missing from the plain realview_defconfig. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/arm/configs/realview_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 8f56fb3ff51d..9f84c508a5f4 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -1,5 +1,6 @@
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
+CONFIG_NO_HZ_FULL=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_PERF_EVENTS=y
@@ -21,6 +22,7 @@ CONFIG_MACH_REALVIEW_PB11MP=y
CONFIG_MACH_REALVIEW_PB1176=y
CONFIG_MACH_REALVIEW_PBA8=y
CONFIG_MACH_REALVIEW_PBX=y
+CONFIG_SMP=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0