phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code cleanup: use CFG_VXWORKS_MAC_PTR instead of multiple board defines

This commit is contained in:
stroese 2004-12-16 17:37:54 +00:00
parent 1740618202
commit 1cdf5d92cf
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/cmd_elf.c
View File

@ -79,9 +79,7 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
#if defined(CONFIG_WALNUT405) || \
defined(CONFIG_CPCI405) || \
defined(CONFIG_OCRTC) || \
defined(CONFIG_ORSG)
defined(CFG_VXWORKS_MAC_PTR)
DECLARE_GLOBAL_DATA_PTR;
#endif
@ -126,11 +124,8 @@ int do_bootvx ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_WALNUT405)
tmp = (char *) CFG_NVRAM_BASE_ADDR + 0x500;
memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[3], 3);
#elif defined(CONFIG_CPCI405)
tmp = (char *) CFG_NVRAM_BASE_ADDR + CFG_NVRAM_VXWORKS_OFFS;
memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6);
#elif defined(CONFIG_OCRTC) || defined(CONFIG_ORSG)
tmp = (char *) CFG_ETHERNET_MAC_ADDR;
#elif defined(CFG_VXWORKS_MAC_PTR)
tmp = (char *) CFG_VXWORKS_MAC_PTR;
memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6);
#else
puts ("## Ethernet MAC address not copied to NV RAM\n");