rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / cpu / i386 / start.S

diff --git a/cpu/i386/start.S b/cpu/i386/start.S
index 51a27aa21d2ce23c32a908f8a90ffb9347f09836..f5ad833aafff171455f74d2068c1d8f616645f83 100644 (file)
--- 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
@@ -67,7 +67,7 @@ mem_init_ret:
         * (we need atleast bss start+bss size+stack size) */
        movl    $_i386boot_bss_start, %ecx        /* BSS start */
        addl    $_i386boot_bss_size, %ecx         /* BSS size */
-       addl    $CFG_STACK_SIZE, %ecx
+       addl    $CONFIG_SYS_STACK_SIZE, %ecx
        cmpl    %ecx, %eax
        jae     mem_ok
 
@@ -76,7 +76,7 @@ mem_init_ret:
        movl    $.progress0a, %ebp
        jmp     show_boot_progress
 .progress0a:
-       jmp     die
+       jmp     die
 mem_ok:
 
        /* indicate progress */
@@ -88,7 +88,7 @@ mem_ok:
        /* create a stack after the bss */
        movl    $_i386boot_bss_start, %eax
        addl    $_i386boot_bss_size, %eax
-       addl    $CFG_STACK_SIZE, %eax
+       addl    $CONFIG_SYS_STACK_SIZE, %eax
        movl    %eax, %esp
 
        pushl   $0
@@ -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: