summaryrefslogtreecommitdiff
path: root/cpu/i386/start.S
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-06-03 20:19:08 +0200
committerStefan Roese <sr@denx.de>2008-06-03 20:19:08 +0200
commit10a3367955bc2033b288915f8f10d0e507fe2fa1 (patch)
treec3ac82364df83db5d5cb963c64b863b77a20445c /cpu/i386/start.S
parent97f7d27c8ecf34879d6b747c10fa9a18c02a4cc0 (diff)
parent1f1554841a4c8e069d331176f0c3059fb2bb8280 (diff)
downloadu-boot-imx-10a3367955bc2033b288915f8f10d0e507fe2fa1.zip
u-boot-imx-10a3367955bc2033b288915f8f10d0e507fe2fa1.tar.gz
u-boot-imx-10a3367955bc2033b288915f8f10d0e507fe2fa1.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'cpu/i386/start.S')
-rw-r--r--cpu/i386/start.S12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpu/i386/start.S b/cpu/i386/start.S
index 51a27aa..264ac09 100644
--- a/cpu/i386/start.S
+++ b/cpu/i386/start.S
@@ -34,8 +34,8 @@
.globl _i386boot_start
_i386boot_start:
_start:
- movl $0x18,%eax /* Load our segement registes, the
- * gdt have already been loaded by start16.S */
+ movl $0x18,%eax /* Load our segement registes, the
+ * gdt have already been loaded by start16.S */
movw %ax,%fs
movw %ax,%ds
movw %ax,%gs
@@ -76,7 +76,7 @@ mem_init_ret:
movl $.progress0a, %ebp
jmp show_boot_progress
.progress0a:
- jmp die
+ jmp die
mem_ok:
/* indicate progress */
@@ -138,7 +138,7 @@ data_fail:
movl $.progress2a, %ebp
jmp show_boot_progress
.progress2a:
- jmp die
+ jmp die
data_ok:
@@ -162,7 +162,7 @@ bss:
movl $0, (%edi)
add $4, %edi
loop bss
- jmp bss_ok
+ jmp bss_ok
bss_fail:
/* indicate (lack of) progress */
@@ -170,7 +170,7 @@ bss_fail:
movl $.progress3a, %ebp
jmp show_boot_progress
.progress3a:
- jmp die
+ jmp die
bss_ok: