X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_nios%2Fboard.c;h=cd234578b7474cb16e74ddfae70592d882ea1e83;hb=52cb4d4fb3487313f5a72ea740f527a4aefaa365;hp=024beb51503833a487df0d52e62d8471a829b912;hpb=f82642e33899766892499b163e60560fbbf87773;p=u-boot

diff --git a/lib_nios/board.c b/lib_nios/board.c
index 024beb5150..cd234578b7 100644
--- a/lib_nios/board.c
+++ b/lib_nios/board.c
@@ -25,7 +25,7 @@
  */
 
 #include <common.h>
-#include <devices.h>
+#include <stdio_dev.h>
 #include <watchdog.h>
 #include <net.h>
 #ifdef CONFIG_STATUS_LED
@@ -142,23 +142,20 @@ void board_init (void)
 		}
 	}
 
+	WATCHDOG_RESET ();
+	mem_malloc_init();
+	malloc_bin_reloc();
+
 	WATCHDOG_RESET ();
 	bd->bi_flashsize = flash_init();
 
 	WATCHDOG_RESET ();
-	mem_malloc_init();
-	malloc_bin_reloc();
 	env_relocate();
 
 	bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
-	s = getenv ("ethaddr");
-	for (i = 0; i < 6; ++i) {
-		bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-		if (s) s = (*e) ? e + 1 : e;
-	}
 
 	WATCHDOG_RESET ();
-	devices_init();
+	stdio_init();
 	jumptable_init();
 	console_init_r();
 	/*