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 254aecff510eb035e780007a095b82786dd0f4a3..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,8 +30,8 @@
 #include <miiphy.h>
 #endif
 
-#include <asm/initcalls.h>
 #include <asm/sections.h>
+#include <asm/arch/mmu.h>
 
 #ifndef CONFIG_IDENT_STRING
 #define CONFIG_IDENT_STRING ""
@@ -40,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 */
@@ -102,7 +98,7 @@ static int init_baudrate(void)
        char tmp[64];
        int i;
 
-       i = getenv_r("baudrate", tmp, sizeof(tmp));
+       i = getenv_f("baudrate", tmp, sizeof(tmp));
        if (i > 0) {
                gd->baudrate = simple_strtoul(tmp, NULL, 10);
        } else {
@@ -117,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;
 }
 
@@ -189,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.
@@ -256,7 +252,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        extern char * env_name_spec;
 #endif
        char *s;
-       cmd_tbl_t *cmdtp;
        bd_t *bd;
 
        gd = new_gd;
@@ -265,34 +260,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        gd->flags |= GD_FLG_RELOC;
        gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE;
 
+       /* Enable the MMU so that we can keep u-boot simple */
+       mmu_init_r(dest_addr);
+
        board_early_init_r();
 
        monitor_flash_len = _edata - _text;
 
+#if defined(CONFIG_NEEDS_MANUAL_RELOC)
        /*
         * We have to relocate the command table manually
         */
-       for (cmdtp = &__u_boot_cmd_start;
-            cmdtp !=  &__u_boot_cmd_end; cmdtp++) {
-               unsigned long addr;
-
-               addr = (unsigned long)cmdtp->cmd + gd->reloc_off;
-               cmdtp->cmd = (typeof(cmdtp->cmd))addr;
-
-               addr = (unsigned long)cmdtp->name + gd->reloc_off;
-               cmdtp->name = (typeof(cmdtp->name))addr;
-
-               if (cmdtp->usage) {
-                       addr = (unsigned long)cmdtp->usage + gd->reloc_off;
-                       cmdtp->usage = (typeof(cmdtp->usage))addr;
-               }
-#ifdef CONFIG_SYS_LONGHELP
-               if (cmdtp->help) {
-                       addr = (unsigned long)cmdtp->help + gd->reloc_off;
-                       cmdtp->help = (typeof(cmdtp->help))addr;
-               }
-#endif
-       }
+       fixup_cmdtable(&__u_boot_cmd_start,
+               (ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start));
+#endif /* defined(CONFIG_NEEDS_MANUAL_RELOC) */
 
        /* there are some other pointer constants we must deal with */
 #ifndef CONFIG_ENV_IS_NOWHERE
@@ -349,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