Merge tag 'armsoc-soc' into test-merge

[uclinux-h8/linux.git] / arch / arm / mach-socfpga / headsmp.S

diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index f65ea0a..5d94b7a 100644 (file)
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -10,6 +10,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/memory.h>
+#include <asm/assembler.h>
 
        .arch   armv7-a
 
@@ -18,20 +19,17 @@ ENTRY(secondary_trampoline)
         * Thus, we can just subtract the PAGE_OFFSET to get the physical
         * address of &cpu1start_addr. This would not work for platforms
         * where the physical memory does not start at 0x0.
-        */
+       */
+ARM_BE8(setend be)
        adr     r0, 1f
        ldmia   r0, {r1, r2}
        sub     r2, r2, #PAGE_OFFSET
        ldr     r3, [r2]
        ldr     r4, [r3]
+ARM_BE8(rev    r4, r4)
        bx      r4
 
        .align
 1:     .long   .
        .long   socfpga_cpu1start_addr
 ENTRY(secondary_trampoline_end)
-
-ENTRY(socfpga_secondary_startup)
-       bl      v7_invalidate_l1
-       b       secondary_startup
-ENDPROC(socfpga_secondary_startup)