aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-18 08:32:16 -0500
committerArnd Bergmann <arnd@arndb.de>2015-12-18 10:53:45 -0500
commit8c5eb925ac16be05f03fc37c7562c65bdb7718b1 (patch)
tree2f666e00221760a843702193bc49e797721c9305
parent0c3ef539436588f9af910d1449ec70a91fcc5c8f (diff)
ARM: realview: select apropriate targets
Now that we have multiplatform support, let the RealView defconfigs select all the RealView boards so we boot out of the box like before. This updates both defconfigs. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/realview-smp_defconfig9
-rw-r--r--arch/arm/configs/realview_defconfig8
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
index b482b7277281..93efdcfcf98f 100644
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
@@ -10,10 +10,19 @@ CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 10CONFIG_MODULE_UNLOAD=y
11# CONFIG_BLK_DEV_BSG is not set 11# CONFIG_BLK_DEV_BSG is not set
12# CONFIG_IOSCHED_CFQ is not set 12# CONFIG_IOSCHED_CFQ is not set
13CONFIG_ARCH_MULTI_V6=y
13CONFIG_ARCH_REALVIEW=y 14CONFIG_ARCH_REALVIEW=y
15CONFIG_REALVIEW_DT=y
14CONFIG_MACH_REALVIEW_EB=y 16CONFIG_MACH_REALVIEW_EB=y
17CONFIG_REALVIEW_EB_ARM1136=y
18CONFIG_REALVIEW_EB_ARM1176=y
19CONFIG_REALVIEW_EB_A9MP=y
15CONFIG_REALVIEW_EB_ARM11MP=y 20CONFIG_REALVIEW_EB_ARM11MP=y
21CONFIG_REALVIEW_EB_ARM11MP_REVB=y
16CONFIG_MACH_REALVIEW_PB11MP=y 22CONFIG_MACH_REALVIEW_PB11MP=y
23CONFIG_MACH_REALVIEW_PB1176=y
24CONFIG_MACH_REALVIEW_PBA8=y
25CONFIG_MACH_REALVIEW_PBX=y
17CONFIG_SMP=y 26CONFIG_SMP=y
18CONFIG_AEABI=y 27CONFIG_AEABI=y
19CONFIG_ZBOOT_ROM_TEXT=0x0 28CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 56ea47427eca..8f56fb3ff51d 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -8,11 +8,19 @@ CONFIG_MODULES=y
8CONFIG_MODULE_UNLOAD=y 8CONFIG_MODULE_UNLOAD=y
9# CONFIG_BLK_DEV_BSG is not set 9# CONFIG_BLK_DEV_BSG is not set
10# CONFIG_IOSCHED_CFQ is not set 10# CONFIG_IOSCHED_CFQ is not set
11CONFIG_ARCH_MULTI_V6=y
11CONFIG_ARCH_REALVIEW=y 12CONFIG_ARCH_REALVIEW=y
13CONFIG_REALVIEW_DT=y
12CONFIG_MACH_REALVIEW_EB=y 14CONFIG_MACH_REALVIEW_EB=y
15CONFIG_REALVIEW_EB_ARM1136=y
16CONFIG_REALVIEW_EB_ARM1176=y
17CONFIG_REALVIEW_EB_A9MP=y
13CONFIG_REALVIEW_EB_ARM11MP=y 18CONFIG_REALVIEW_EB_ARM11MP=y
19CONFIG_REALVIEW_EB_ARM11MP_REVB=y
14CONFIG_MACH_REALVIEW_PB11MP=y 20CONFIG_MACH_REALVIEW_PB11MP=y
15CONFIG_MACH_REALVIEW_PB1176=y 21CONFIG_MACH_REALVIEW_PB1176=y
22CONFIG_MACH_REALVIEW_PBA8=y
23CONFIG_MACH_REALVIEW_PBX=y
16CONFIG_AEABI=y 24CONFIG_AEABI=y
17CONFIG_ZBOOT_ROM_TEXT=0x0 25CONFIG_ZBOOT_ROM_TEXT=0x0
18CONFIG_ZBOOT_ROM_BSS=0x0 26CONFIG_ZBOOT_ROM_BSS=0x0