summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-06-27 12:44:14 +0400
committerLinus Walleij <linus.walleij@linaro.org>2014-10-22 11:49:26 +0400
commit9713497b6c64c67c8763f8f07fad325b193764b6 (patch)
tree9acabf9593cba902be5a1722f8b5d7b63bae89ee /arch
parent68f3b875f7848f5304472184a4634148c5330cbd (diff)
downloadlinux-9713497b6c64c67c8763f8f07fad325b193764b6.tar.xz
ARM: integrator: set V4T and V5 as default multitargets
When switching the Integrator machines to multiplatform, the V7 target becomes default, but most Integrators are V4T or V5, so set these two as default in the defconfig and deselect V7. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/integrator_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index c1f5adc5493e..71f14675d009 100644
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -8,6 +8,9 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
+CONFIG_ARCH_MULTI_V4T=y
+CONFIG_ARCH_MULTI_V5=y
+# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_INTEGRATOR=y
CONFIG_ARCH_INTEGRATOR_AP=y
CONFIG_ARCH_INTEGRATOR_CP=y