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_r.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_r.c')
| -rw-r--r-- | common/board_r.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/common/board_r.c b/common/board_r.c index 551429c843..231c6d6711 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -715,6 +715,15 @@ init_fnc_t init_sequence_r[] = { /* TODO: could x86/PPC have this also perhaps? */ #ifdef CONFIG_ARM initr_caches, +#endif + initr_reloc_global_data, + initr_barrier, + initr_malloc, + bootstage_relocate, +#ifdef CONFIG_DM + initr_dm, +#endif +#ifdef CONFIG_ARM board_init, /* Setup chipselects */ #endif /* @@ -726,7 +735,7 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CLOCKS set_cpu_clk_info, /* Setup clock information */ #endif - initr_reloc_global_data, + stdio_init_tables, initr_serial, initr_announce, INIT_FUNC_WATCHDOG_RESET @@ -763,12 +772,6 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_WINBOND_83C553 initr_w83c553f, #endif - initr_barrier, - initr_malloc, - bootstage_relocate, -#ifdef CONFIG_DM - initr_dm, -#endif #ifdef CONFIG_ARCH_EARLY_INIT_R arch_early_init_r, #endif @@ -818,7 +821,7 @@ init_fnc_t init_sequence_r[] = { */ initr_pci, #endif - stdio_init, + stdio_add_devices, initr_jumptable, #ifdef CONFIG_API initr_api, |
