Merge branch 'next' of ../master

[oweals/u-boot.git] / lib_nios2 / board.c

diff --git a/lib_nios2/board.c b/lib_nios2/board.c
index d759f0fd8042362dc43117ee2e00aa9f0750397d..0677e999952ac82994c91215e8e4a7099cd6dc55 100644 (file)
--- a/lib_nios2/board.c
+++ b/lib_nios2/board.c
@@ -148,20 +148,17 @@ 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();