summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-05-20 22:33:44 +0200
committerWolfgang Denk <wd@denx.de>2012-05-20 22:33:44 +0200
commit8bd07c9aaf4628931ab8da6eb0f83e517d9381a7 (patch)
treea0b3d31f7b56426cef184f8e6c21fff2aedf49ce /board
parentee3a55fdf00b54391e406217e53674449e70d78b (diff)
parentde30122bb58fee7b0f94bcfabab595b6ad757336 (diff)
downloadu-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 'board')
-rw-r--r--board/esd/cpci405/cpci405.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/board/esd/cpci405/cpci405.c b/board/esd/cpci405/cpci405.c
index 41b5ba0..1441b10 100644
--- a/board/esd/cpci405/cpci405.c
+++ b/board/esd/cpci405/cpci405.c
@@ -730,12 +730,11 @@ int do_get_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/*
* Update whole ip-addr
*/
- bd->bi_ip_addr = ipaddr;
sprintf(str, "%ld.%ld.%ld.%ld",
- (bd->bi_ip_addr & 0xff000000) >> 24,
- (bd->bi_ip_addr & 0x00ff0000) >> 16,
- (bd->bi_ip_addr & 0x0000ff00) >> 8,
- (bd->bi_ip_addr & 0x000000ff));
+ (ipaddr & 0xff000000) >> 24,
+ (ipaddr & 0x00ff0000) >> 16,
+ (ipaddr & 0x0000ff00) >> 8,
+ (ipaddr & 0x000000ff));
setenv("ipaddr", str);
printf("Updated ip_addr from bp_eeprom to %s!\n", str);
}