Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

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

diff --git a/lib_sh/board.c b/lib_sh/board.c
index d4cc85cad140faf58a95f9b38c3bbada2667ea27..183110fe30b42b15d89c71a41bc5376b121d4206 100644 (file)
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -125,17 +125,7 @@ static int sh_mem_env_init(void)
 static int sh_net_init(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
-       char *s, *e;
-       int i;
-
        gd->bd->bi_ip_addr = getenv_IPaddr("ipaddr");
-       s = getenv("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               gd->bd->bi_enetaddr[i] = s ? simple_strtoul(s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
-
        return 0;
 }
 #endif
@@ -156,8 +146,8 @@ init_fnc_t *init_sequence[] =
        checkboard,             /* Check support board */
        dram_init,              /* SDRAM init */
        timer_init,             /* SuperH Timer (TCNT0 only) init */
-       sh_flash_init,  /* Flash memory(NOR) init*/
        sh_mem_env_init,
+       sh_flash_init,  /* Flash memory(NOR) init*/
        INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
        INIT_FUNC_PCI_INIT      /* PCI init */
        devices_init,