Explorar el Código

x86: Move call to dram_init_f into board_init_f

Graeme Russ hace 14 años
padre
commit
c869e2ac46
Se han modificado 3 ficheros con 4 adiciones y 3 borrados
  1. 0 3
      arch/i386/cpu/start.S
  2. 1 0
      arch/i386/include/asm/u-boot-i386.h
  3. 3 0
      arch/i386/lib/board.c

+ 0 - 3
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
 

+ 1 - 0
arch/i386/include/asm/u-boot-i386.h

@@ -37,6 +37,7 @@ int register_timer_isr (timer_fnc_t *isr_func);
 
 /* Architecture specific - can be in arch/i386/cpu/, arch/i386/lib/, or $(BOARD)/ */
 int timer_init(void);
+int dram_init_f(void);
 
 /* cpu/.../interrupts.c */
 int cpu_init_interrupts(void);

+ 3 - 0
arch/i386/lib/board.c

@@ -197,6 +197,9 @@ void board_init_f(ulong boot_flags)
 
 	gd->flags = boot_flags;
 
+	if (dram_init_f() != 0)
+		hang();
+
 	/* Calculate destination RAM Address and relocation offset */
 	dest_addr = (void *)gd->ram_size;
 	addr_sp = dest_addr;