diff options
| author | Simon Glass <sjg@chromium.org> | 2014-09-03 17:36:59 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-09-10 12:59:57 -0600 |
| commit | 3ea0953d36023d7e50fb00b2e258d8fb2828aeac (patch) | |
| tree | 14068f40e78c5482a1dad65c4d21fa1d64cb1f77 | |
| parent | b7a809957bcd72c2efa49ce733774b1e28878585 (diff) | |
| download | blackbird-obmc-uboot-3ea0953d36023d7e50fb00b2e258d8fb2828aeac.tar.gz blackbird-obmc-uboot-3ea0953d36023d7e50fb00b2e258d8fb2828aeac.zip | |
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>
| -rw-r--r-- | common/board_f.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |
