Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Use new numeric setenv functions

Browse source 
Use setenv_ulong(), setenv_hex() and setenv_addr() in net/

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2013-02-24 17:33:24 +00:00
parent 49c4f0370b
commit 978226da5e
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/fm/fm.c
View file

@ -362,7 +362,6 @@ static void fm_init_qmi(struct fm_qmi_common *qmi)
int fm_init_common(int index, struct ccsr_fman *reg) int fm_init_common(int index, struct ccsr_fman *reg)
{ {
int rc; int rc;
char env_addr[32];
#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR) #if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR)
void *addr = (void *)CONFIG_SYS_QE_FMAN_FW_ADDR; void *addr = (void *)CONFIG_SYS_QE_FMAN_FW_ADDR;
#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NAND) #elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NAND)
@ -416,8 +415,7 @@ int fm_init_common(int index, struct ccsr_fman *reg)
rc = fman_upload_firmware(index, &reg->fm_imem, addr); rc = fman_upload_firmware(index, &reg->fm_imem, addr);
if (rc) if (rc)
return rc; return rc;
sprintf(env_addr, "0x%lx", (long unsigned int)addr); setenv_addr("fman_ucode", addr);
setenv("fman_ucode", env_addr);
fm_init_muram(index, &reg->muram); fm_init_muram(index, &reg->muram);
fm_init_qmi(&reg->fm_qmi_common); fm_init_qmi(&reg->fm_qmi_common);

8
net/net.c
View file

@ -528,15 +528,11 @@ restart:
case NETLOOP_SUCCESS: case NETLOOP_SUCCESS:
net_cleanup_loop(); net_cleanup_loop();
if (NetBootFileXferSize > 0) { if (NetBootFileXferSize > 0) {
char buf[20];
printf("Bytes transferred = %ld (%lx hex)\n", printf("Bytes transferred = %ld (%lx hex)\n",
NetBootFileXferSize, NetBootFileXferSize,
NetBootFileXferSize); NetBootFileXferSize);
sprintf(buf, "%lX", NetBootFileXferSize); setenv_hex("filesize", NetBootFileXferSize);
setenv("filesize", buf); setenv_hex("fileaddr", load_addr);
sprintf(buf, "%lX", (unsigned long)load_addr);
setenv("fileaddr", buf);
} }
if (protocol != NETCONS) if (protocol != NETCONS)
eth_halt(); eth_halt();