projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-avr32
[oweals/u-boot.git]
/
arch
/
avr32
/
lib
/
board.c
diff --git
a/arch/avr32/lib/board.c
b/arch/avr32/lib/board.c
index d626c29c00694660ec196d34859b94999aac82bd..d7a64b48727aedaf5879ace43dd1faf9f3b759e0 100644
(file)
--- a/
arch/avr32/lib/board.c
+++ b/
arch/avr32/lib/board.c
@@
-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
#ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec;
#endif
- char *s;
bd_t *bd;
gd = new_gd;
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();
/* initialize environment */
env_relocate();
- bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
-
stdio_init();
jumptable_init();
console_init_r();
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)
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
puts("Net: ");
eth_initialize(gd->bd);
#endif