mpc85xx: USB: Add support

[u-boot] / lib_mips / board.c

diff --git a/lib_mips/board.c b/lib_mips/board.c
index dfe683161fd30879305efb6a0c20ced1b73d5dc7..f8ac234d10884bc4a8f75dd9445ce9498466e99e 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -323,9 +323,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
-       char *s, *e;
+       char *s;
        bd_t *bd;
-       int i;
 
        gd = id;
        gd->flags |= GD_FLG_RELOC;      /* tell others: relocation done */
@@ -371,6 +370,10 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
        bd = gd->bd;
 
+       /* initialize malloc() area */
+       mem_malloc_init();
+       malloc_bin_reloc();
+
 #ifndef CONFIG_SYS_NO_FLASH
        /* configure available FLASH banks */
        size = flash_init();
@@ -385,10 +388,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
        bd->bi_flashoffset = 0;
 #endif
 
-       /* initialize malloc() area */
-       mem_malloc_init();
-       malloc_bin_reloc();
-
 #ifdef CONFIG_CMD_NAND
        puts ("NAND:  ");
        nand_init ();           /* go init the NAND */
@@ -401,14 +400,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
        /* relocate environment function pointers etc. */
        env_relocate();
 
-       /* board MAC address */
-       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;
-       }
-
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr("ipaddr");