summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2008-09-29 23:03:14 +1000
committerWolfgang Denk <wd@denx.de>2008-10-28 00:26:35 +0100
commita369f4a492fa2805d87775d27380f0eeaca35aa6 (patch)
tree10462df351b36a43df5769b5799d91e993ddd8d7 /board
parent16263ffd3c6d77645891bfd1b311713d936771f1 (diff)
downloadu-boot-imx-a369f4a492fa2805d87775d27380f0eeaca35aa6.zip
u-boot-imx-a369f4a492fa2805d87775d27380f0eeaca35aa6.tar.gz
u-boot-imx-a369f4a492fa2805d87775d27380f0eeaca35aa6.tar.bz2
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>
Diffstat (limited to 'board')
-rw-r--r--board/sc520_cdp/sc520_cdp_asm.S4
-rw-r--r--board/sc520_spunk/sc520_spunk_asm.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/board/sc520_cdp/sc520_cdp_asm.S b/board/sc520_cdp/sc520_cdp_asm.S
index 6ac5a5d..3a8a03f 100644
--- 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 3430b6a..eda7e91 100644
--- 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)