diff options
author | Wolfgang Denk <wd@denx.de> | 2012-05-20 22:33:44 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-05-20 22:33:44 +0200 |
commit | 8bd07c9aaf4628931ab8da6eb0f83e517d9381a7 (patch) | |
tree | a0b3d31f7b56426cef184f8e6c21fff2aedf49ce /arch/m68k/lib/board.c | |
parent | ee3a55fdf00b54391e406217e53674449e70d78b (diff) | |
parent | de30122bb58fee7b0f94bcfabab595b6ad757336 (diff) | |
download | u-boot-imx-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.zip u-boot-imx-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.tar.gz u-boot-imx-8bd07c9aaf4628931ab8da6eb0f83e517d9381a7.tar.bz2 |
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/m68k/lib/board.c')
-rw-r--r-- | arch/m68k/lib/board.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index 1526967..65a8595 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -507,15 +507,6 @@ void board_init_r (gd_t *id, ulong dest_addr) /* relocate environment function pointers etc. */ env_relocate (); - /* - * Fill in missing fields of bd_info. - * We do this here, where we have "normal" access to the - * environment; we used to do this still running from ROM, - * where had to use getenv_f(), which can be pretty slow when - * the environment is in EEPROM. - */ - bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); - WATCHDOG_RESET (); #if defined(CONFIG_PCI) @@ -568,11 +559,6 @@ void board_init_r (gd_t *id, ulong dest_addr) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_CMD_NET) - if ((s = getenv ("bootfile")) != NULL) { - copy_filename (BootFile, s, sizeof (BootFile)); - } -#endif WATCHDOG_RESET (); |