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 77f03322bb4afa088517674e831dfb3362187719..00313897ce8517da4288e2870a4c97593ed48adb 100644 (file)
--- a/arch/i386/cpu/start.S
+++ b/arch/i386/cpu/start.S
@@ -93,9 +93,6 @@ car_init_ret:
        subl    $1b, %ecx
        movl    %ecx, (GD_LOAD_OFF * 4)(%ebp)
 
-       /* size memory */
-       call    dram_init_f
-
        /* Set parameter to board_init_f() to boot flags */
        movl    (GD_FLAGS * 4)(%ebp), %eax
 
@@ -123,7 +120,7 @@ relocate_code:
 
        /* Setup call address of in-RAM copy of board_init_r() */
        movl    $board_init_r, %ebp
-       subl    (GD_RELOC_OFF * 4)(%edx), %ebp
+       addl    (GD_RELOC_OFF * 4)(%edx), %ebp
 
        /* Setup parameters to board_init_r() */
        movl    %edx, %eax