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

[u-boot] / arch / avr32 / lib / board.c

diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index e110d234e885babe8d32d634d77a0e449aec41bb..d7a64b48727aedaf5879ace43dd1faf9f3b759e0 100644 (file)
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -39,7 +39,7 @@
 #define CONFIG_IDENT_STRING ""
 #endif
 
-#ifdef CONFIG_ATMEL_MCI
+#ifdef CONFIG_GENERIC_ATMEL_MCI
 #include <mmc.h>
 #endif
 DECLARE_GLOBAL_DATA_PTR;
@@ -254,7 +254,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 #ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
-       char *s;
        bd_t *bd;
 
        gd = new_gd;
@@ -316,8 +315,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        /* initialize environment */
        env_relocate();
 
-       bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
-
        stdio_init();
        jumptable_init();
        console_init_r();
@@ -329,9 +326,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        bb_miiphy_init();
 #endif
 #if defined(CONFIG_CMD_NET)
-       s = getenv("bootfile");
-       if (s)
-               copy_filename(BootFile, s, sizeof(BootFile));
        puts("Net:   ");
        eth_initialize(gd->bd);
 #endif