Merge branch 'mimc200' into next

[oweals/u-boot.git] / cpu / leon2 / start.S

diff --git a/cpu/leon2/start.S b/cpu/leon2/start.S
index f23f49937166356b241e3721431e30cf070a7f97..b1f1eb5f3ce28c6be6983375f880e61bf9eca0fe 100644 (file)
--- a/cpu/leon2/start.S
+++ b/cpu/leon2/start.S
@@ -27,6 +27,7 @@
 #include <asm/psr.h>
 #include <asm/stack.h>
 #include <asm/leon.h>
+#include <timestamp.h>
 #include <version.h>
 
 /* Entry for traps which jump to a programmer-specified trap handler.  */
@@ -68,7 +69,7 @@ ARGPUSH = (WINDOWSIZE + 4)
 MINFRAME = (WINDOWSIZE + ARGPUSHSIZE + 4)
 
 /* Number of register windows */
-#ifndef CFG_SPARC_NWINDOWS
+#ifndef CONFIG_SYS_SPARC_NWINDOWS
 #error Must define number of SPARC register windows, default is 8
 #endif
 
@@ -199,7 +200,7 @@ _trap_table:
        .globl  version_string
 version_string:
        .ascii U_BOOT_VERSION
-       .ascii " (", __DATE__, " - ", __TIME__, ")"
+       .ascii " (", U_BOOT_DATE, " - ", U_BOOT_TIME, ")"
        .ascii CONFIG_IDENT_STRING, "\0"
 
        .section        ".text"
@@ -280,16 +281,16 @@ leon2_init_ioport:
 leon2_init_mctrl:
 
        /* memory config register 1 */
-       set     CFG_GRLIB_MEMCFG1, %g2
+       set     CONFIG_SYS_GRLIB_MEMCFG1, %g2
        ld      [%g1], %g3              !
        and     %g3, 0x300, %g3
        or      %g2, %g3, %g2
        st      %g2, [%g1 + LEON2_MCFG1]
-       set     CFG_GRLIB_MEMCFG2, %g2          ! Load memory config register 2
+       set     CONFIG_SYS_GRLIB_MEMCFG2, %g2           ! Load memory config register 2
 #if !( defined(TSIM) || !defined(BZIMAGE))
        st      %g2, [%g1 + LEON2_MCFG2]        ! only for prom version, else done by "dumon -i"
 #endif
-       set     CFG_GRLIB_MEMCFG3, %g2          ! Init FT register
+       set     CONFIG_SYS_GRLIB_MEMCFG3, %g2           ! Init FT register
        st      %g2, [%g1 + LEON2_ECTRL]
        ld      [%g1 + LEON2_ECTRL], %g2
        srl     %g2, 30, %g2
@@ -310,7 +311,7 @@ leon2_init_psr:
        nop
 
 leon2_init_stackp:
-       set     CFG_INIT_SP_OFFSET, %fp
+       set     CONFIG_SYS_INIT_SP_OFFSET, %fp
        andn    %fp, 0x0f, %fp
        sub     %fp, 64, %sp
 
@@ -327,7 +328,7 @@ cpu_init_unreloc:
 reloc:
        set     TEXT_START,%g2
        set     DATA_END,%g3
-       set     CFG_RELOC_MONITOR_BASE,%g4
+       set     CONFIG_SYS_RELOC_MONITOR_BASE,%g4
 reloc_loop:
        ldd     [%g2],%l0
        ldd     [%g2+8],%l2
@@ -373,10 +374,10 @@ fixup_got:
        set     __got_end,%g3
 /*
  * new got offset = (old GOT-PTR (read with ld) -
- *   CFG_RELOC_MONITOR_BASE(from define) ) +
+ *   CONFIG_SYS_RELOC_MONITOR_BASE(from define) ) +
  *   Destination Address (from define)
  */
-       set     CFG_RELOC_MONITOR_BASE,%g2
+       set     CONFIG_SYS_RELOC_MONITOR_BASE,%g2
        set     TEXT_START, %g1
        add     %g4,%g2,%g4
        sub     %g4,%g1,%g4
@@ -397,7 +398,7 @@ got_loop:
 prom_relocate:
        set     __prom_start, %g2
        set     __prom_end, %g3
-       set     CFG_PROM_OFFSET, %g4
+       set     CONFIG_SYS_PROM_OFFSET, %g4
 
 prom_relocate_loop:
        ldd     [%g2],%l0
@@ -413,7 +414,7 @@ prom_relocate_loop:
  * the new trap table address
  */
 
-       set     CFG_RELOC_MONITOR_BASE, %g2
+       set     CONFIG_SYS_RELOC_MONITOR_BASE, %g2
        wr      %g0, %g2, %tbr
 
 /*     call    relocate*/
@@ -421,14 +422,14 @@ prom_relocate_loop:
 /* Call relocated init functions */
 jump:
        set     cpu_init_f2,%o1
-       set     CFG_RELOC_MONITOR_BASE,%o2
+       set     CONFIG_SYS_RELOC_MONITOR_BASE,%o2
        add     %o1,%o2,%o1
        sub     %o1,%g1,%o1
        call    %o1
        clr     %o0
 
        set     board_init_f,%o1
-       set     CFG_RELOC_MONITOR_BASE,%o2
+       set     CONFIG_SYS_RELOC_MONITOR_BASE,%o2
        add     %o1,%o2,%o1
        sub     %o1,%g1,%o1
        call    %o1
@@ -454,7 +455,7 @@ _irq_entry:
        WRITE_PAUSE
        mov     %l7, %o0                ! irq level
        set     handler_irq, %o1
-       set     (CFG_RELOC_MONITOR_BASE-TEXT_BASE), %o2
+       set     (CONFIG_SYS_RELOC_MONITOR_BASE-TEXT_BASE), %o2
        add     %o1, %o2, %o1
        call    %o1
        add     %sp, SF_REGS_SZ, %o1    ! pt_regs ptr
@@ -472,7 +473,7 @@ _window_overflow:
        mov     %wim, %l3               ! Calculate next WIM
        mov     %g1, %l7
        srl     %l3, 1, %g1
-       sll     %l3, (CFG_SPARC_NWINDOWS-1) , %l4
+       sll     %l3, (CONFIG_SYS_SPARC_NWINDOWS-1) , %l4
        or      %l4, %g1, %g1
 
        save                            ! Get into window to be saved.
@@ -509,7 +510,7 @@ _window_underflow:
 
        mov  %wim, %l3                  ! Calculate next WIM
        sll  %l3, 1, %l4
-       srl  %l3, (CFG_SPARC_NWINDOWS-1), %l5
+       srl  %l3, (CONFIG_SYS_SPARC_NWINDOWS-1), %l5
        or   %l5, %l4, %l5
        mov  %l5, %wim
        nop; nop; nop
@@ -578,7 +579,7 @@ trap_setup:
         */
        srl     %t_wim, 0x1, %g2                ! begin computation of new %wim
 
-       set     (CFG_SPARC_NWINDOWS-1), %g3     !NWINDOWS-1
+       set     (CONFIG_SYS_SPARC_NWINDOWS-1), %g3      !NWINDOWS-1
 
        sll     %t_wim, %g3, %t_wim     ! NWINDOWS-1
        or      %t_wim, %g2, %g2
@@ -612,7 +613,7 @@ ret_trap_entry:
        mov     2, %g1
        sll     %g1, %t_psr, %g1
 
-       set     CFG_SPARC_NWINDOWS, %g2 !NWINDOWS
+       set     CONFIG_SYS_SPARC_NWINDOWS, %g2  !NWINDOWS
 
        srl     %g1, %g2, %g2
        or      %g1, %g2, %g1
@@ -622,7 +623,7 @@ ret_trap_entry:
         sll    %g2, 0x1, %g1
 
        /* We have to grab a window before returning. */
-       set     (CFG_SPARC_NWINDOWS-1), %g3     !NWINDOWS-1
+       set     (CONFIG_SYS_SPARC_NWINDOWS-1), %g3      !NWINDOWS-1
 
        srl     %g2, %g3,  %g2
        or      %g1, %g2, %g1