x86: Place global data below stack before entering C

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

diff --git a/arch/i386/cpu/start.S b/arch/i386/cpu/start.S
index f67a1b7a6e99a47e8ca212dd043d1adc2c7449d4..cff463758940ebbdda7992e57b11e81c3d5daef9 100644 (file)
--- a/arch/i386/cpu/start.S
+++ b/arch/i386/cpu/start.S
@@ -1,7 +1,7 @@
 /*
  *  U-boot - i386 Startup Code
  *
- *  Copyright (c) 2002 Omicron Ceti AB, Daniel Engström <denaiel@omicron.se>
+ *  Copyright (c) 2002 Omicron Ceti AB, Daniel Engstr�m <denaiel@omicron.se>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -25,6 +25,7 @@
 
 #include <config.h>
 #include <version.h>
+#include <asm/global_data.h>
 
 
 .section .text
@@ -79,94 +80,65 @@ _start:
         * to store the return address */
 
        /* Early platform init (setup gpio, etc ) */
-       mov     $early_board_init_ret, %ebp
        jmp     early_board_init
+.globl early_board_init_ret
 early_board_init_ret:
 
-       /* The __port80 entry-point should be usabe by now */
-       /* so we try to indicate progress */
-       movw    $0x01, %ax
-       movl    $.progress0, %ebp
-       jmp     show_boot_progress_asm
-.progress0:
-
        /* size memory */
-       mov     $mem_init_ret, %ebp
        jmp     mem_init
+.globl mem_init_ret
 mem_init_ret:
 
        /* fetch memory size (into %eax) */
-       mov     $get_mem_size_ret, %ebp
        jmp     get_mem_size
+.globl get_mem_size_ret
 get_mem_size_ret:
 
+#if CONFIG_SYS_SDRAM_ECC_ENABLE
+       /* Skip ECC initialization if not starting from cold-reset */
+       movl    %ebx, %ecx
+       andl    $GD_FLG_COLD_BOOT, %ecx
+       jz      init_ecc_ret
+       jmp     init_ecc
+
+.globl init_ecc_ret
+init_ecc_ret:
+#endif
+
        /* Check we have enough memory for stack */
        movl    $CONFIG_SYS_STACK_SIZE, %ecx
        cmpl    %ecx, %eax
-       jae     mem_ok
-
-       /* indicate (lack of) progress */
-       movw    $0x81, %ax
-       movl    $.progress0a, %ebp
-       jmp     show_boot_progress_asm
-.progress0a:
-       jmp     die
+       jb      die
 mem_ok:
        /* Set stack pointer to upper memory limit*/
        movl    %eax, %esp
 
-       /* indicate progress */
-       movw    $0x02, %ax
-       movl    $.progress1, %ebp
-       jmp     show_boot_progress_asm
-.progress1:
-
        /* Test the stack */
        pushl   $0
-       popl    %eax
-       cmpl    $0, %eax
-       jne     no_stack
+       popl    %ecx
+       cmpl    $0, %ecx
+       jne     die
        push    $0x55aa55aa
-       popl    %ebx
-       cmpl    $0x55aa55aa, %ebx
-       je      stack_ok
-
-no_stack:
-       /* indicate (lack of) progress */
-       movw    $0x82, %ax
-       movl    $.progress1a, %ebp
-       jmp     show_boot_progress_asm
-.progress1a:
-       jmp die
-
-
-stack_ok:
-       /* indicate progress */
-       movw    $0x03, %ax
-       movl    $.progress2, %ebp
-       jmp     show_boot_progress_asm
-.progress2:
+       popl    %ecx
+       cmpl    $0x55aa55aa, %ecx
+       jne     die
 
        wbinvd
 
-       /* Get upper memory limit */
-       movl    %esp, %ecx
-       subl    $CONFIG_SYS_STACK_SIZE, %ecx
+       /* Set the upper memory limit parameter */
+       subl    $CONFIG_SYS_STACK_SIZE, %eax
+
+       /* Reserve space for global data */
+       subl    $(GD_SIZE * 4), %eax
 
-       /* Create a Stack Frame */
-       pushl   %ebp
-       movl    %esp, %ebp
+       /* %eax points to the global data structure */
+       movl    %esp, (GD_RAM_SIZE * 4)(%eax)
+       movl    %ebx, (GD_FLAGS * 4)(%eax)
 
-       /* stack_limit parameter */
-       pushl   %ecx
        call    board_init_f    /* Enter, U-boot! */
 
        /* indicate (lack of) progress */
        movw    $0x85, %ax
-       movl    $.progress4a, %ebp
-       jmp     show_boot_progress_asm
-.progress4a:
-
 die:   hlt
        jmp     die
        hlt