diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-14 21:16:07 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-14 21:17:01 (GMT) |
commit | c91321e8ff338a88a9272dcd938f085955cd5846 (patch) | |
tree | 3285fcdc17b2275555ad28747364eae6c4aa2e11 /arch/arm/mach-socfpga/headsmp.S | |
parent | 1f1ba836455b94494aaee9381ed9197ade2f770f (diff) | |
parent | 9560f840f301868b4b4b175e81afa96dc57611ac (diff) | |
download | linux-fsl-qoriq-c91321e8ff338a88a9272dcd938f085955cd5846.tar.xz |
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/mach-socfpga/headsmp.S')
-rw-r--r-- | arch/arm/mach-socfpga/headsmp.S | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S new file mode 100644 index 0000000..f09b128 --- /dev/null +++ b/arch/arm/mach-socfpga/headsmp.S @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2003 ARM Limited + * Copyright (c) u-boot contributors + * Copyright (c) 2012 Pavel Machek <pavel@denx.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <linux/linkage.h> +#include <linux/init.h> + + __CPUINIT + .arch armv7-a + +#define CPU1_START_ADDR 0xffd08010 + +ENTRY(secondary_trampoline) + movw r0, #:lower16:CPU1_START_ADDR + movt r0, #:upper16:CPU1_START_ADDR + + ldr r1, [r0] + bx r1 + +ENTRY(secondary_trampoline_end) |