Merge branch 'master' of git://git.denx.de/u-boot-mips

[u-boot] / arch / i386 / cpu / start.S

diff --git a/arch/i386/cpu/start.S b/arch/i386/cpu/start.S
index 97bac8f3a640d934d716e5cde2b9a8d6e5eb7b09..00313897ce8517da4288e2870a4c97593ed48adb 100644 (file)
--- a/arch/i386/cpu/start.S
+++ b/arch/i386/cpu/start.S
@@ -72,73 +72,63 @@ _start:
 .globl early_board_init_ret
 early_board_init_ret:
 
-       /* Skip memory initialization if not starting from cold-reset */
-       movl    %ebx, %ecx
-       andl    $GD_FLG_COLD_BOOT, %ecx
-       jz      skip_mem_init
-
-       /* size memory */
-       jmp     mem_init
-.globl mem_init_ret
-mem_init_ret:
-
-skip_mem_init:
-       /* fetch memory size (into %eax) */
-       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
-       jb      die
-mem_ok:
-       /* Set stack pointer to upper memory limit*/
-       movl    %eax, %esp
-
-       /* Test the stack */
-       pushl   $0
-       popl    %ecx
-       cmpl    $0, %ecx
-       jne     die
-       push    $0x55aa55aa
-       popl    %ecx
-       cmpl    $0x55aa55aa, %ecx
-       jne     die
+       /* Initialise Cache-As-RAM */
+       jmp     car_init
+.globl car_init_ret
+car_init_ret:
+       /*
+        * We now have CONFIG_SYS_CAR_SIZE bytes of Cache-As-RAM (or SRAM,
+        * or fully initialised SDRAM - we really don't care which)
+        * starting at CONFIG_SYS_CAR_ADDR to be used as a temporary stack
+        */
+       movl    $CONFIG_SYS_INIT_SP_ADDR, %esp
+       movl    $CONFIG_SYS_INIT_GD_ADDR, %ebp
 
-       wbinvd
+       /* Set Boot Flags in Global Data */
+       movl    %ebx, (GD_FLAGS * 4)(%ebp)
 
-       /* Determine our load offset */
+       /* Determine our load offset (and put in Global Data) */
        call    1f
 1:     popl    %ecx
        subl    $1b, %ecx
+       movl    %ecx, (GD_LOAD_OFF * 4)(%ebp)
 
-       /* Set the upper memory limit parameter */
-       subl    $CONFIG_SYS_STACK_SIZE, %eax
-
-       /* Reserve space for global data */
-       subl    $(GD_SIZE * 4), %eax
-
-       /* %eax points to the global data structure */
-       movl    %esp, (GD_RAM_SIZE * 4)(%eax)
-       movl    %ebx, (GD_FLAGS * 4)(%eax)
-       movl    %ecx, (GD_LOAD_OFF * 4)(%eax)
+       /* Set parameter to board_init_f() to boot flags */
+       movl    (GD_FLAGS * 4)(%ebp), %eax
 
        call    board_init_f    /* Enter, U-boot! */
 
        /* indicate (lack of) progress */
        movw    $0x85, %ax
+       jmp     die
+
+.globl relocate_code
+.type relocate_code, @function
+relocate_code:
+       /*
+        * SDRAM has been initialised, U-Boot code has been copied into
+        * RAM, BSS has been cleared and relocation adjustments have been
+        * made. It is now time to jump into the in-RAM copy of U-Boot
+        *
+        * %eax = Address of top of stack
+        * %edx = Address of Global Data
+        * %ecx = Base address of in-RAM copy of U-Boot
+        */
+
+       /* Setup stack in RAM */
+       movl    %eax, %esp
+
+       /* Setup call address of in-RAM copy of board_init_r() */
+       movl    $board_init_r, %ebp
+       addl    (GD_RELOC_OFF * 4)(%edx), %ebp
+
+       /* Setup parameters to board_init_r() */
+       movl    %edx, %eax
+       movl    %ecx, %edx
+
+       /* Jump to in-RAM copy of board_init_r() */
+       call    *%ebp
+
 die:   hlt
        jmp     die
        hlt