Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[oweals/u-boot.git] / cpu / mpc85xx / release.S

diff --git a/cpu/mpc85xx/release.S b/cpu/mpc85xx/release.S
index 3b7366ff692c1dbbddd36ac1e3b4382a114bb0f6..75676b5b9e8bd9d88d2e3ce0b139cb070b29298e 100644 (file)
--- a/cpu/mpc85xx/release.S
+++ b/cpu/mpc85xx/release.S
@@ -114,6 +114,7 @@ __secondary_start_page:
        lwz     r4,ENTRY_ADDR_LOWER(r10)
        andi.   r11,r4,1
        bne     2b
+       isync
 
        /* get the upper bits of the addr */
        lwz     r11,ENTRY_ADDR_UPPER(r10)
@@ -169,10 +170,10 @@ __secondary_start_page:
        mtspr   SPRN_SRR1,r13
        rfi
 
-       .align 3
+       .align L1_CACHE_SHIFT
        .globl __spin_table
 __spin_table:
-       .space CONFIG_NR_CPUS*ENTRY_SIZE
+       .space CONFIG_NUM_CPUS*ENTRY_SIZE
 
        /* Fill in the empty space.  The actual reset vector is
         * the last word of the page */