Skip to content
Snippets Groups Projects
Commit a369f4a4 authored by Graeme Russ's avatar Graeme Russ Committed by Wolfgang Denk
Browse files

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: default avatarGraeme Russ <graeme.russ@gmail.com>
parent 16263ffd
No related branches found
No related tags found
No related merge requests found
...@@ -76,8 +76,8 @@ done: movb $0x88, %al ...@@ -76,8 +76,8 @@ done: movb $0x88, %al
jmp *%ebp /* return to caller */ jmp *%ebp /* return to caller */
.globl show_boot_progress .globl show_boot_progress_asm
show_boot_progress: show_boot_progress_asm:
out %al, $0x80 out %al, $0x80
xchg %al, %ah xchg %al, %ah
movw $0x680, %dx movw $0x680, %dx
......
...@@ -73,8 +73,8 @@ done: movl $0xfffefc32,%edx ...@@ -73,8 +73,8 @@ done: movl $0xfffefc32,%edx
jmp *%ebp /* return to caller */ jmp *%ebp /* return to caller */
.globl show_boot_progress .globl show_boot_progress_asm
show_boot_progress: show_boot_progress_asm:
movl $0xfffefc32,%edx movl $0xfffefc32,%edx
xorw $0xffff, %ax xorw $0xffff, %ax
movw %ax,(%edx) movw %ax,(%edx)
......
...@@ -55,7 +55,7 @@ early_board_init_ret: ...@@ -55,7 +55,7 @@ early_board_init_ret:
/* so we try to indicate progress */ /* so we try to indicate progress */
movw $0x01, %ax movw $0x01, %ax
movl $.progress0, %ebp movl $.progress0, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress0: .progress0:
/* size memory */ /* size memory */
...@@ -74,7 +74,7 @@ mem_init_ret: ...@@ -74,7 +74,7 @@ mem_init_ret:
/* indicate (lack of) progress */ /* indicate (lack of) progress */
movw $0x81, %ax movw $0x81, %ax
movl $.progress0a, %ebp movl $.progress0a, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress0a: .progress0a:
jmp die jmp die
mem_ok: mem_ok:
...@@ -82,7 +82,7 @@ mem_ok: ...@@ -82,7 +82,7 @@ mem_ok:
/* indicate progress */ /* indicate progress */
movw $0x02, %ax movw $0x02, %ax
movl $.progress1, %ebp movl $.progress1, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress1: .progress1:
/* create a stack after the bss */ /* create a stack after the bss */
...@@ -104,7 +104,7 @@ no_stack: ...@@ -104,7 +104,7 @@ no_stack:
/* indicate (lack of) progress */ /* indicate (lack of) progress */
movw $0x82, %ax movw $0x82, %ax
movl $.progress1a, %ebp movl $.progress1a, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress1a: .progress1a:
jmp die jmp die
...@@ -113,7 +113,7 @@ stack_ok: ...@@ -113,7 +113,7 @@ stack_ok:
/* indicate progress */ /* indicate progress */
movw $0x03, %ax movw $0x03, %ax
movl $.progress2, %ebp movl $.progress2, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress2: .progress2:
/* copy data section to ram, size must be 4-byte aligned */ /* copy data section to ram, size must be 4-byte aligned */
...@@ -136,7 +136,7 @@ data_fail: ...@@ -136,7 +136,7 @@ data_fail:
/* indicate (lack of) progress */ /* indicate (lack of) progress */
movw $0x83, %ax movw $0x83, %ax
movl $.progress2a, %ebp movl $.progress2a, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress2a: .progress2a:
jmp die jmp die
...@@ -145,7 +145,7 @@ data_ok: ...@@ -145,7 +145,7 @@ data_ok:
/* indicate progress */ /* indicate progress */
movw $0x04, %ax movw $0x04, %ax
movl $.progress3, %ebp movl $.progress3, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress3: .progress3:
/* clear bss section in ram, size must be 4-byte aligned */ /* clear bss section in ram, size must be 4-byte aligned */
...@@ -168,7 +168,7 @@ bss_fail: ...@@ -168,7 +168,7 @@ bss_fail:
/* indicate (lack of) progress */ /* indicate (lack of) progress */
movw $0x84, %ax movw $0x84, %ax
movl $.progress3a, %ebp movl $.progress3a, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress3a: .progress3a:
jmp die jmp die
...@@ -180,7 +180,7 @@ bss_ok: ...@@ -180,7 +180,7 @@ bss_ok:
/* indicate progress */ /* indicate progress */
movw $0x05, %ax movw $0x05, %ax
movl $.progress4, %ebp movl $.progress4, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress4: .progress4:
call start_i386boot /* Enter, U-boot! */ call start_i386boot /* Enter, U-boot! */
...@@ -188,7 +188,7 @@ bss_ok: ...@@ -188,7 +188,7 @@ bss_ok:
/* indicate (lack of) progress */ /* indicate (lack of) progress */
movw $0x85, %ax movw $0x85, %ax
movl $.progress4a, %ebp movl $.progress4a, %ebp
jmp show_boot_progress jmp show_boot_progress_asm
.progress4a: .progress4a:
die: hlt die: hlt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment