diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-14 16:16:07 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-14 16:17:01 -0500 |
commit | c91321e8ff338a88a9272dcd938f085955cd5846 (patch) | |
tree | 3285fcdc17b2275555ad28747364eae6c4aa2e11 /arch/arm/configs | |
parent | 1f1ba836455b94494aaee9381ed9197ade2f770f (diff) | |
parent | 9560f840f301868b4b4b175e81afa96dc57611ac (diff) |
ARM: arm-soc: Merge branch 'next/smp' into next/soc2
Merging in the smp-on-socfpga branch into soc2 since the topics are similar
and it's a short branch in the first place.
* next/smp:
ARM: socfpga: mark secondary_trampoline as cpuinit
socfpga: map uart into virtual address space so that early_printk() works
ARM: socfpga: fix build break for allyesconfig
ARM: socfpga: Enable SMP for socfpga
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/socfpga_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index 0ac1293dba10..4e1ce211d43f 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig | |||
@@ -18,9 +18,10 @@ CONFIG_MODULE_UNLOAD=y | |||
18 | CONFIG_ARCH_SOCFPGA=y | 18 | CONFIG_ARCH_SOCFPGA=y |
19 | CONFIG_MACH_SOCFPGA_CYCLONE5=y | 19 | CONFIG_MACH_SOCFPGA_CYCLONE5=y |
20 | CONFIG_ARM_THUMBEE=y | 20 | CONFIG_ARM_THUMBEE=y |
21 | # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set | ||
21 | # CONFIG_CACHE_L2X0 is not set | 22 | # CONFIG_CACHE_L2X0 is not set |
22 | CONFIG_HIGH_RES_TIMERS=y | 23 | CONFIG_HIGH_RES_TIMERS=y |
23 | CONFIG_VMSPLIT_2G=y | 24 | CONFIG_SMP=y |
24 | CONFIG_NR_CPUS=2 | 25 | CONFIG_NR_CPUS=2 |
25 | CONFIG_AEABI=y | 26 | CONFIG_AEABI=y |
26 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 27 | CONFIG_ZBOOT_ROM_TEXT=0x0 |