rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / cpu / mips / start.S

diff --git a/cpu/mips/start.S b/cpu/mips/start.S
index 6e1a78c..6a22302 100644 (file)
--- a/cpu/mips/start.S
+++ b/cpu/mips/start.S
@@ -23,7 +23,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/regdef.h>
 #include <asm/mipsregs.h>
 
@@ -275,14 +274,14 @@ reset:
 
        /* Set up temporary stack.
         */
-#ifdef CFG_INIT_RAM_LOCK_MIPS
-       li      a0, CFG_INIT_SP_OFFSET
+#ifdef CONFIG_SYS_INIT_RAM_LOCK_MIPS
+       li      a0, CONFIG_SYS_INIT_SP_OFFSET
        la      t9, mips_cache_lock
        jalr    t9
        nop
 #endif
 
-       li      t0, CFG_SDRAM_BASE + CFG_INIT_SP_OFFSET
+       li      t0, CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_INIT_SP_OFFSET
        la      sp, 0(t0)
 
        la      t9, board_init_f
@@ -304,7 +303,7 @@ reset:
 relocate_code:
        move    sp, a0          /* Set new stack pointer        */
 
-       li      t0, CFG_MONITOR_BASE
+       li      t0, CONFIG_SYS_MONITOR_BASE
        la      t3, in_ram
        lw      t2, -12(t3)     /* t2 <-- uboot_end_data        */
        move    t1, a2
@@ -312,10 +311,10 @@ relocate_code:
        /*
         * Fix $gp:
         *
-        * New $gp = (Old $gp - CFG_MONITOR_BASE) + Destination Address
+        * New $gp = (Old $gp - CONFIG_SYS_MONITOR_BASE) + Destination Address
         */
        move    t6, gp
-       sub     gp, CFG_MONITOR_BASE
+       sub     gp, CONFIG_SYS_MONITOR_BASE
        add     gp, a2          /* gp now adjusted              */
        sub     t6, gp, t6      /* t6 <-- relocation offset     */
 
@@ -345,7 +344,8 @@ relocate_code:
        jr      t0
        nop
 
-       .gpword _GLOBAL_OFFSET_TABLE_   /* _GLOBAL_OFFSET_TABLE_ - _gp  */
+       .word   _gp
+       .word   _GLOBAL_OFFSET_TABLE_
        .word   uboot_end_data
        .word   uboot_end
        .word   num_got_entries
@@ -358,8 +358,10 @@ in_ram:
         * generated by GNU ld. Skip these reserved entries from relocation.
         */
        lw      t3, -4(t0)      /* t3 <-- num_got_entries       */
-       lw      t4, -16(t0)     /* t4 <-- (_GLOBAL_OFFSET_TABLE_ - _gp) */
-       add     t4, t4, gp      /* t4 now holds _GLOBAL_OFFSET_TABLE_   */
+       lw      t4, -16(t0)     /* t4 <-- _GLOBAL_OFFSET_TABLE_ */
+       lw      t5, -20(t0)     /* t5 <-- _gp   */
+       sub     t4, t5          /* compute offset*/
+       add     t4, t4, gp      /* t4 now holds relocated _GLOBAL_OFFSET_TABLE_ */
        addi    t4, t4, 8       /* Skipping first two entries.  */
        li      t2, 2
 1: