rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / cpu / sh4 / start.S

diff --git a/cpu/sh4/start.S b/cpu/sh4/start.S
index d88b705ef08bffac35a7d71616883976ac20b8eb..711ae668d59bc4403e0a1d098f951d3a7a5cbe72 100644 (file)
--- a/cpu/sh4/start.S
+++ b/cpu/sh4/start.S
@@ -33,21 +33,21 @@ _start:
        bsr     1f
        nop
 1:     sts     pr, r5
-       mov.l   ._reloc_dst, r4 
-       add     #(_start-1b), r5        
-       mov.l   ._reloc_dst_end, r6     
+       mov.l   ._reloc_dst, r4
+       add     #(_start-1b), r5
+       mov.l   ._reloc_dst_end, r6
 
 2:     mov.l   @r5+, r1
        mov.l   r1, @r4
        add     #4, r4
        cmp/hs  r6, r4
        bf      2b
-       
-       mov.l   ._bss_start, r4 
-       mov.l   ._bss_end, r5           
+
+       mov.l   ._bss_start, r4
+       mov.l   ._bss_end, r5
        mov     #0, r1
 
-3:     mov.l   r1, @r4                 /* bss clear */ 
+3:     mov.l   r1, @r4                 /* bss clear */
        add     #4, r4
        cmp/hs  r5, r4
        bf      3b
@@ -56,8 +56,8 @@ _start:
        mov.l   ._stack_init, r15       /* stack */
 
        mov.l   ._sh_generic_init, r0
-       jsr     @r0                     
-       nop                             
+       jsr     @r0
+       nop
 
 loop:
        bra     loop
@@ -69,7 +69,6 @@ loop:
 ._reloc_dst_end:       .long   reloc_dst_end
 ._bss_start:           .long   bss_start
 ._bss_end:             .long   bss_end
-._gd_init:             .long   (_start - CFG_GBL_DATA_SIZE)
-._stack_init:          .long   (_start - CFG_GBL_DATA_SIZE - CFG_MALLOC_LEN - 16)
+._gd_init:             .long   (_start - CONFIG_SYS_GBL_DATA_SIZE)
+._stack_init:          .long   (_start - CONFIG_SYS_GBL_DATA_SIZE - CONFIG_SYS_MALLOC_LEN - 16)
 ._sh_generic_init:     .long   sh_generic_init
-