Merge branch 'master' of git://git.denx.de/u-boot-mips

[u-boot] / arch / microblaze / lib / board.c

diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index df27c1c1b9330c4c1472de910ac78608fc6cbeb0..ca5882dd0d8e607f9ae85864cc09c05ee69e3e0e 100644 (file)
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -166,6 +166,12 @@ void board_init (void)
        /* Initialize stdio devices */
        stdio_init ();
 
+       /* Initialize the jump table for applications */
+       jumptable_init();
+
+       /* Initialize the console (after the relocation and devices init) */
+       console_init_r();
+
        if ((s = getenv ("loadaddr")) != NULL) {
                load_addr = simple_strtoul (s, NULL, 16);
        }
@@ -180,6 +186,10 @@ void board_init (void)
        uchar enetaddr[6];
        eth_getenv_enetaddr("ethaddr", enetaddr);
        printf("MAC:   %pM\n", enetaddr);
+
+       s = getenv("bootfile");
+       if (s != NULL)
+               copy_filename(BootFile, s, sizeof(BootFile));
 #endif
 
        /* main_loop */