diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-05-20 20:33:44 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-05-20 20:33:44 (GMT) |
| commit | 8bd07c9aaf4628931ab8da6eb0f83e517d9381a7 (patch) | |
| tree | a0b3d31f7b56426cef184f8e6c21fff2aedf49ce /arch/blackfin/lib/board.c | |
| parent | ee3a55fdf00b54391e406217e53674449e70d78b (diff) | |
| parent | de30122bb58fee7b0f94bcfabab595b6ad757336 (diff) | |
| download | u-boot-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
* 'master' of git://git.denx.de/u-boot-net:
net: move bootfile init into eth_initialize
net: punt bd->bi_ip_addr
net: cosmetic: netconsole.c checkpatch compliance
net: cosmetic: tftp.* checkpatch compliance
net: cosmetic: sntp.* checkpatch compliance
net: cosmetic: rarp.* checkpatch compliance
net: cosmetic: nfs.* checkpatch compliance
net: cosmetic: net.c checkpatch compliance
net: cosmetic: eth.c checkpatch compliance
net: cosmetic: bootp.* checkpatch compliance
net: cosmetic: net.h checkpatch compliance
net: Remove volatile from net API
Diffstat (limited to 'arch/blackfin/lib/board.c')
| -rw-r--r-- | arch/blackfin/lib/board.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 2d424a2..c380d27 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -86,7 +86,6 @@ static void display_global_data(void) printf(" |-jt(%p): %p\n", gd->jt, *(gd->jt)); printf(" \\-bd: %p\n", gd->bd); printf(" |-bi_baudrate: %x\n", bd->bi_baudrate); - printf(" |-bi_ip_addr: %lx\n", bd->bi_ip_addr); printf(" |-bi_boot_params: %lx\n", bd->bi_boot_params); printf(" |-bi_memstart: %lx\n", bd->bi_memstart); printf(" |-bi_memsize: %lx\n", bd->bi_memsize); @@ -320,15 +319,8 @@ static void board_net_init_r(bd_t *bd) bb_miiphy_init(); #endif #ifdef CONFIG_CMD_NET - char *s; - - if ((s = getenv("bootfile")) != NULL) - copy_filename(BootFile, s, sizeof(BootFile)); - - bd->bi_ip_addr = getenv_IPaddr("ipaddr"); - printf("Net: "); - eth_initialize(gd->bd); + eth_initialize(bd); #endif } |