Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / sc520_cdp / sc520_cdp_asm.S

diff --git a/board/sc520_cdp/sc520_cdp_asm.S b/board/sc520_cdp/sc520_cdp_asm.S
index 1e255fab2e9607534437174076aea602e7a93db8..3a8a03f507ab9d8087ffce8420128cfd8bac650d 100644 (file)
--- a/board/sc520_cdp/sc520_cdp_asm.S
+++ b/board/sc520_cdp/sc520_cdp_asm.S
@@ -23,7 +23,7 @@
 
 /* now setup the General purpose bus to give us access to the LEDs.
  * We can then use the leds to display status information.
- */ 
+ */
 
 sc520_cdp_registers:
 /* size    offset        value */
@@ -45,12 +45,12 @@ sc520_cdp_registers:
 /* board early intialization */
 .globl early_board_init
 early_board_init:
-        movl    $sc520_cdp_registers,%esi
-init_loop:     
-        movl    $0xfffef000,%edi     /* MMCR base to edi */                                    
+       movl    $sc520_cdp_registers,%esi
+init_loop:
+       movl    $0xfffef000,%edi     /* MMCR base to edi */
        movw    (%esi), %bx          /* load sizer to bx */
        cmpw    $0, %bx              /* if sie is 0 we're done */
-       je      done 
+       je      done
        xorl    %edx,%edx
        movw    2(%esi), %dx        /* load MMCR offset to dx */
        addl    %edx, %edi          /* add offset to base in edi */
@@ -61,7 +61,7 @@ init_loop:
        je      word                 /* word op? */
        movl    %eax, (%edi)         /* must be long, then */
        jmp     next
-byte:   movb    %al,(%edi)        
+byte:   movb    %al,(%edi)
        jmp     next
 word:  movw    %ax,(%edi)
 next:  addl    $8, %esi             /* advance esi */
@@ -73,14 +73,13 @@ done:   movb        $0x88, %al
        movw    $0x680, %dx
        out     %al, %dx
 
-       jmp     *%ebp                /* return to caller */
+       jmp     *%ebp                /* return to caller */
 
 
-.globl __show_boot_progress
-__show_boot_progress:
+.globl show_boot_progress_asm
+show_boot_progress_asm:
        out     %al, $0x80
        xchg    %al, %ah
        movw    $0x680, %dx
        out     %al, %dx
        jmp     *%ebp
-