net: drop !NET_MULTI code

[karo-tx-uboot.git] / arch / sparc / lib / board.c

diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index ab31cfb50addf543729c05c7c1a19d8e98f7a334..af4f0356a46f6e4afce10527922a6187942759ec 100644 (file)
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -284,7 +284,7 @@ void board_init_f(ulong bootflag)
        malloc_bin_reloc();
 
 #if !defined(CONFIG_SYS_NO_FLASH)
-       puts("FLASH: ");
+       puts("Flash: ");
 
        if ((flash_size = flash_init()) > 0) {
 # ifdef CONFIG_SYS_FLASH_CHECKSUM
@@ -365,8 +365,6 @@ void board_init_f(ulong bootflag)
 
        udelay(20);
 
-       set_timer(0);
-
        /* Initialize from environment */
        if ((s = getenv("loadaddr")) != NULL) {
                load_addr = simple_strtoul(s, NULL, 16);
@@ -389,10 +387,8 @@ void board_init_f(ulong bootflag)
        bb_miiphy_init();
 #endif
 #if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
        WATCHDOG_RESET();
        puts("Net:   ");
-#endif
        eth_initialize(bd);
 #endif