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 cb47ce7faa61807111638a54840cd4b464ebd5ee..00313897ce8517da4288e2870a4c97593ed48adb 100644 (file)
--- a/arch/i386/cpu/start.S
+++ b/arch/i386/cpu/start.S
@@ -25,6 +25,8 @@
 
 #include <config.h>
 #include <version.h>
+#include <asm/global_data.h>
+#include <asm/processor-flags.h>
 
 
 .section .text
@@ -45,12 +47,12 @@ _i386boot_start:
 
        /* Turn of cache (this might require a 486-class CPU) */
        movl    %cr0, %eax
-       orl     $0x60000000, %eax
+       orl     $(X86_CR0_NW | X86_CR0_CD), %eax
        movl    %eax, %cr0
        wbinvd
 
        /* Tell 32-bit code it is being entered from an in-RAM copy */
-       movw    $0x0000, %bx
+       movw    $GD_FLG_WARM_BOOT, %bx
 _start:
        /* This is the 32-bit cold-reset entry point */
 
@@ -65,62 +67,68 @@ _start:
        /* Clear the interupt vectors */
        lidt    blank_idt_ptr
 
-       /*
-        * Skip low-level board and memory initialization if not starting
-        * from cold-reset. This allows us to do a fail safe boot-strap
-        * into a new build of U-Boot from a known-good boot flash
-        */
-       movw    $0x0001, %ax
-       cmpw    %ax, %bx
-       jne     mem_init_ret
-
-       /* We call a few functions in the board support package
-        * since we have no stack yet we'll have to use %ebp
-        * 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:
 
-       /* size memory */
-       mov     $mem_init_ret, %ebp
-       jmp     mem_init
-mem_init_ret:
-
-       /* fetch memory size (into %eax) */
-       mov     $get_mem_size_ret, %ebp
-       jmp     get_mem_size
-get_mem_size_ret:
-
-       /* 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
+       /* 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
 
-       /* Test the stack */
-       pushl   $0
-       popl    %eax
-       cmpl    $0, %eax
-       jne     no_stack
-       push    $0x55aa55aa
-       popl    %ebx
-       cmpl    $0x55aa55aa, %ebx
-       jne     die
+       /* Set Boot Flags in Global Data */
+       movl    %ebx, (GD_FLAGS * 4)(%ebp)
 
-       wbinvd
+       /* 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 */
-       movl    %esp, %eax
-       subl    $CONFIG_SYS_STACK_SIZE, %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