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 /common/cmd_nvedit.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 'common/cmd_nvedit.c')
| -rw-r--r-- | common/cmd_nvedit.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index e1ccdd8..5999cb8 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -343,21 +343,7 @@ int _do_env_set(int flag, int argc, char * const argv[]) * Some variables should be updated when the corresponding * entry in the environment is changed */ - if (strcmp(name, "ipaddr") == 0) { - char *s = argv[2]; /* always use only one arg */ - char *e; - unsigned long addr; - bd->bi_ip_addr = 0; - for (addr = 0, i = 0; i < 4; ++i) { - ulong val = s ? simple_strtoul(s, &e, 10) : 0; - addr <<= 8; - addr |= val & 0xFF; - if (s) - s = *e ? e + 1 : e; - } - bd->bi_ip_addr = htonl(addr); - return 0; - } else if (strcmp(argv[1], "loadaddr") == 0) { + if (strcmp(argv[1], "loadaddr") == 0) { load_addr = simple_strtoul(argv[2], NULL, 16); return 0; } |