diff options
| author | Tom Rini <trini@ti.com> | 2014-09-13 16:32:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-13 16:32:52 -0400 |
| commit | 8d028d404fa117a4b1f425d7cfc8affe1d8df6d5 (patch) | |
| tree | 39cad1c0da41fd8e45a29a4dba23289cbd411773 /common/board_f.c | |
| parent | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (diff) | |
| parent | 858530a8c0a7ce7e573e513934804a00d6676813 (diff) | |
| download | talos-obmc-uboot-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.tar.gz talos-obmc-uboot-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/board_f.c')
| -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 */ |
