i386: Renamed show_boot_progress in assembler code

Renamed show_boot_progress in assembler init phase to
show_boot_progress_asm to avoid link conflicts with C version

Signed-off-by: Graeme Russ <graeme.russ@gmail.com>

diff --git a/board/sc520_cdp/sc520_cdp_asm.S b/board/sc520_cdp/sc520_cdp_asm.S
index 6ac5a5de9d936a3c0f58009e96028f35672c82a8..3a8a03f507ab9d8087ffce8420128cfd8bac650d 100644 (file)
--- a/board/sc520_cdp/sc520_cdp_asm.S
+++ b/board/sc520_cdp/sc520_cdp_asm.S
@@ -76,8 +76,8 @@ done:   movb  $0x88, %al
        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

diff --git a/board/sc520_spunk/sc520_spunk_asm.S b/board/sc520_spunk/sc520_spunk_asm.S
index 3430b6adbafe350199f390e3b3c37241d6660a84..eda7e9110a4282dde7eb24cadfb25c5dcbbea9e2 100644 (file)
--- a/board/sc520_spunk/sc520_spunk_asm.S
+++ b/board/sc520_spunk/sc520_spunk_asm.S
@@ -73,8 +73,8 @@ done:   movl    $0xfffefc32,%edx
        jmp     *%ebp                /* return to caller */
 
 
-.globl show_boot_progress
-show_boot_progress:
+.globl show_boot_progress_asm
+show_boot_progress_asm:
        movl    $0xfffefc32,%edx
        xorw    $0xffff, %ax
        movw    %ax,(%edx)

diff --git a/cpu/i386/start.S b/cpu/i386/start.S
index f5ad833aafff171455f74d2068c1d8f616645f83..b6175b1c1db58c1d67f704c7314be47f5f17e44b 100644 (file)
--- a/cpu/i386/start.S
+++ b/cpu/i386/start.S
@@ -55,7 +55,7 @@ early_board_init_ret:
        /* so we try to indicate progress */
        movw    $0x01, %ax
        movl    $.progress0, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress0:
 
        /* size memory */
@@ -74,7 +74,7 @@ mem_init_ret:
        /* indicate (lack of) progress */
        movw    $0x81, %ax
        movl    $.progress0a, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress0a:
        jmp     die
 mem_ok:
@@ -82,7 +82,7 @@ mem_ok:
        /* indicate progress */
        movw    $0x02, %ax
        movl    $.progress1, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress1:
 
        /* create a stack after the bss */
@@ -104,7 +104,7 @@ no_stack:
        /* indicate (lack of) progress */
        movw    $0x82, %ax
        movl    $.progress1a, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress1a:
        jmp die
 
@@ -113,7 +113,7 @@ stack_ok:
        /* indicate progress */
        movw    $0x03, %ax
        movl    $.progress2, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress2:
 
        /* copy data section to ram, size must be 4-byte aligned */
@@ -136,7 +136,7 @@ data_fail:
        /* indicate (lack of) progress */
        movw    $0x83, %ax
        movl    $.progress2a, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress2a:
        jmp     die
 
@@ -145,7 +145,7 @@ data_ok:
        /* indicate progress */
        movw    $0x04, %ax
        movl    $.progress3, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress3:
 
        /* clear bss section in ram, size must be 4-byte aligned  */
@@ -168,7 +168,7 @@ bss_fail:
        /* indicate (lack of) progress */
        movw    $0x84, %ax
        movl    $.progress3a, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress3a:
        jmp     die
 
@@ -180,7 +180,7 @@ bss_ok:
        /* indicate progress */
        movw    $0x05, %ax
        movl    $.progress4, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress4:
 
        call    start_i386boot  /* Enter, U-boot! */
@@ -188,7 +188,7 @@ bss_ok:
        /* indicate (lack of) progress */
        movw    $0x85, %ax
        movl    $.progress4a, %ebp
-       jmp     show_boot_progress
+       jmp     show_boot_progress_asm
 .progress4a:
 
 die:   hlt