summaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-09-13 20:32:52 (GMT)
committerTom Rini <trini@ti.com>2014-09-13 20:32:52 (GMT)
commit8d028d404fa117a4b1f425d7cfc8affe1d8df6d5 (patch)
tree39cad1c0da41fd8e45a29a4dba23289cbd411773 /common/board_r.c
parent114cc4290b2f24bb314edf2edd5d8738a0778c4b (diff)
parent858530a8c0a7ce7e573e513934804a00d6676813 (diff)
downloadu-boot-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 551429c..231c6d6 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,