net: drop !NET_MULTI code

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

diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 8b56237f1893d705807ad5735c0e0d78664ca9fd..3e1cc0d6c99888aecfd5736a6de3987f871c8cdb 100644 (file)
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -23,7 +23,6 @@
 #include <command.h>
 #include <malloc.h>
 #include <stdio_dev.h>
-#include <timestamp.h>
 #include <version.h>
 #include <net.h>
 
@@ -31,7 +30,6 @@
 #include <miiphy.h>
 #endif
 
-#include <asm/initcalls.h>
 #include <asm/sections.h>
 #include <asm/arch/mmu.h>
 
@@ -41,9 +39,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-const char version_string[] =
-       U_BOOT_VERSION " ("U_BOOT_DATE" - "U_BOOT_TIME") " CONFIG_IDENT_STRING;
-
 unsigned long monitor_flash_len;
 
 /* Weak aliases for optional board functions */
@@ -118,7 +113,7 @@ static int display_banner (void)
        printf ("\n\n%s\n\n", version_string);
        printf ("U-Boot code: %08lx -> %08lx  data: %08lx -> %08lx\n",
                (unsigned long)_text, (unsigned long)_etext,
-               (unsigned long)_data, (unsigned long)_end);
+               (unsigned long)_data, (unsigned long)__bss_end__);
        return 0;
 }
 
@@ -190,7 +185,7 @@ void board_init_f(ulong board_type)
         *  - stack
         */
        addr = CONFIG_SYS_SDRAM_BASE + sdram_size;
-       monitor_len = _end - _text;
+       monitor_len = __bss_end__ - _text;
 
        /*
         * Reserve memory for u-boot code, data and bss.
@@ -335,9 +330,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        s = getenv("bootfile");
        if (s)
                copy_filename(BootFile, s, sizeof(BootFile));
-#if defined(CONFIG_NET_MULTI)
        puts("Net:   ");
-#endif
        eth_initialize(gd->bd);
 #endif