mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-29 23:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

i386: Fix multiple definitions of __show_boot_progress

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-05-18 19:09:58 +02:00 committed by Wolfgang Denk
parent 311f344693
commit 3cc27b426a
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/sc520_cdp/sc520_cdp_asm.S
View File

@ -76,8 +76,8 @@ done: movb $0x88, %al
jmp *%ebp /* return to caller */
.globl __show_boot_progress
__show_boot_progress:
.globl show_boot_progress
show_boot_progress:
out %al, $0x80
xchg %al, %ah
movw $0x680, %dx

4
board/sc520_spunk/sc520_spunk_asm.S
View File

@ -73,8 +73,8 @@ done: movl $0xfffefc32,%edx
jmp *%ebp /* return to caller */
.globl __show_boot_progress
__show_boot_progress:
.globl show_boot_progress
show_boot_progress:
movl $0xfffefc32,%edx
xorw $0xffff, %ax
movw %ax,(%edx)

20
cpu/i386/start.S
View File

@ -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
.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
.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
.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
.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
.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
.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
.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
.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
.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
.progress4a:
die: hlt