rename CFG_ macros to CONFIG_SYS

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

diff --git a/cpu/leon2/start.S b/cpu/leon2/start.S
index 937ea1ed7741240eac29a4d9717c7f2ebd595cf9..9b5d83ea50f8978a59d140ca19b67c83465fd002 100644 (file)
--- a/cpu/leon2/start.S
+++ b/cpu/leon2/start.S
@@ -31,10 +31,10 @@
 
 /* Entry for traps which jump to a programmer-specified trap handler.  */
 #define TRAPR(H)  \
-       wr      %g0, 0xfe0, %psr; \
-       mov     %g0, %tbr; \
-       ba      (H); \
-       mov     %g0, %wim;
+       wr      %g0, 0xfe0, %psr; \
+       mov     %g0, %tbr; \
+       ba      (H); \
+       mov     %g0, %wim;
 
 #define TRAP(H) \
        mov     %psr, %l0; \
@@ -42,10 +42,10 @@
        nop; nop;
 
 #define TRAPI(ilevel) \
-       mov     ilevel, %l7; \
-       mov     %psr, %l0; \
-       b       _irq_entry; \
-       mov     %wim, %l3
+       mov     ilevel, %l7; \
+       mov     %psr, %l0; \
+       b       _irq_entry; \
+       mov     %wim, %l3
 
 /* Unexcpected trap will halt the processor by forcing it to error state */
 #undef BAD_TRAP
@@ -68,7 +68,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
 
@@ -76,7 +76,7 @@ MINFRAME = (WINDOWSIZE + ARGPUSHSIZE + 4)
 #define SA(X)  (((X)+(STACK_ALIGN-1)) & ~(STACK_ALIGN-1))
 
        .section ".start", "ax"
-       .globl  _start, start, _trap_table
+       .globl  _start, start, _trap_table
        .globl  _irq_entry, nmi_trap
        .globl  _reset_reloc
 
@@ -118,7 +118,7 @@ _trap_table:
        TRAPI(13);                      ! 1d IRQ level 13
        TRAPI(14);                      ! 1e IRQ level 14
        TRAP(_nmi_trap);                ! 1f IRQ level 15 /
-                                       ! NMI (non maskable interrupt)
+                                       ! NMI (non maskable interrupt)
        BAD_TRAP;                       ! 20 r_register_access_error
        BAD_TRAP;                       ! 21 instruction access error
        BAD_TRAP;                       ! 22
@@ -213,9 +213,9 @@ _hardreset:
        nop
 
        /* Init Cache */
-        set     (LEON2_PREGS+LEON_REG_CACHECTRL_OFFSET), %g1
-        set     0x0081000f, %g2
-        st      %g2, [%g1]
+       set     (LEON2_PREGS+LEON_REG_CACHECTRL_OFFSET), %g1
+       set     0x0081000f, %g2
+       st      %g2, [%g1]
 
        mov     %g0, %y
        clr     %g1
@@ -280,16 +280,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 +310,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 +327,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 +373,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 +397,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 +413,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 +421,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 +454,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 +472,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,13 +509,13 @@ _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
        restore                         ! Two restores to get into the
        restore                         ! window to restore
-       ld      [%sp + 0], %l0;         ! Restore window from the stack
+       ld      [%sp + 0], %l0;         ! Restore window from the stack
        ld      [%sp + 4], %l1;
        ld      [%sp + 8], %l2;
        ld      [%sp + 12], %l3;
@@ -547,7 +547,7 @@ _hwerr:
        ta 0
        nop
        nop
-       b _hwerr                        ! loop infinite
+       b _hwerr                        ! loop infinite
        nop
 
 /* Registers to not touch at all. */
@@ -578,13 +578,13 @@ 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
        and     %g2, 0xff, %g2
 
-       save    %g0, %g0, %g0           ! get in window to be saved
+       save    %g0, %g0, %g0           ! get in window to be saved
 
        /* Set new %wim value */
        wr      %g2, 0x0, %wim
@@ -612,7 +612,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 +622,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