From: Simon Glass <sjg@chromium.org>
Date: Wed, 3 Sep 2014 23:36:59 +0000 (-0600)
Subject: dm: Move pre-reloc init earlier to cope with board_early_init_f()
X-Git-Tag: v2014.10-rc3~115^2~16
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ea0953d36023d7e50fb00b2e258d8fb2828aeac;p=u-boot

dm: Move pre-reloc init earlier to cope with board_early_init_f()

In order to support GPIO access in board_early_init_f() we must set up
driver model before this function is called. In any case, earlier is
better since driver model is (or will become) a key function for most
init.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/board_f.c b/common/board_f.c
index 4ece2b6c9f..ea33eadc16 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -831,6 +831,8 @@ static init_fnc_t init_sequence_f[] = {
 #ifdef CONFIG_OF_CONTROL
 	fdtdec_check_fdt,
 #endif
+	initf_malloc,
+	initf_dm,
 #if defined(CONFIG_BOARD_EARLY_INIT_F)
 	board_early_init_f,
 #endif
@@ -866,8 +868,6 @@ static init_fnc_t init_sequence_f[] = {
 	sdram_adjust_866,
 	init_timebase,
 #endif
-	initf_malloc,
-	initf_dm,
 	init_baud_rate,		/* initialze baudrate settings */
 	serial_init,		/* serial communications setup */
 	console_init_f,		/* stage 1 init of console */