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 4ece2b6c9fe34385b5d3dd9b4452f610cf16e708..ea33eadc16e8844bc380251367a870c637658174 100644 (file)
--- 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
 #ifdef CONFIG_OF_CONTROL
        fdtdec_check_fdt,
 #endif

+       initf_malloc,
+       initf_dm,

 #if defined(CONFIG_BOARD_EARLY_INIT_F)
        board_early_init_f,
 #endif
 #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
        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 */
        init_baud_rate,         /* initialze baudrate settings */
        serial_init,            /* serial communications setup */
        console_init_f,         /* stage 1 init of console */