Message ID | 1409787431-4625-2-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Simon Glass |
Headers | show |
On 3 September 2014 17:36, Simon Glass <sjg@chromium.org> wrote: > > 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> Applied to dm/master and now in mainline.
diff --git a/common/board_f.c b/common/board_f.c index 4ece2b6..ea33ead 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 */
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> --- Changes in v7: - Add new patch to init driver model before board_early_init_f() Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None common/board_f.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)