mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-25 07:41:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DM9000 MAC address handling

Browse Source 
Proper behavior is to pull MAC address from NVRAM in the initialization() an
stuff it in dev->address, then program the device from dev->address in
the init() function.

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2009-10-21 21:53:39 -07:00
parent f2b4bc04d6
commit 0775437293
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/dm9000x.c
View File

@ -284,7 +284,6 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
int i, oft, lnk; int i, oft, lnk;
u8 io_mode; u8 io_mode;
struct board_info *db = &dm9000_info; struct board_info *db = &dm9000_info;
uchar enetaddr[6];
DM9000_DBG("%s\n", __func__); DM9000_DBG("%s\n", __func__);
@ -342,20 +341,11 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
/* Clear interrupt status */ /* Clear interrupt status */
DM9000_iow(DM9000_ISR, ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS); DM9000_iow(DM9000_ISR, ISR_ROOS | ISR_ROS | ISR_PTS | ISR_PRS);
/* Set Node address */ printf("MAC: %pM\n", dev->enetaddr);
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
#if !defined(CONFIG_DM9000_NO_SROM)
for (i = 0; i < 3; i++)
dm9000_read_srom_word(i, enetaddr + 2 * i);
eth_setenv_enetaddr("ethaddr", enetaddr);
#endif
}
printf("MAC: %pM\n", enetaddr);
/* fill device MAC address registers */ /* fill device MAC address registers */
for (i = 0, oft = DM9000_PAR; i < 6; i++, oft++) for (i = 0, oft = DM9000_PAR; i < 6; i++, oft++)
DM9000_iow(oft, enetaddr[i]); DM9000_iow(oft, dev->enetaddr[i]);
for (i = 0, oft = 0x16; i < 8; i++, oft++) for (i = 0, oft = 0x16; i < 8; i++, oft++)
DM9000_iow(oft, 0xff); DM9000_iow(oft, 0xff);
@ -558,6 +548,15 @@ void dm9000_write_srom_word(int offset, u16 val)
} }
#endif #endif
static void dm9000_get_enetaddr(struct eth_device *dev)
{
#if !defined(CONFIG_DM9000_NO_SROM)
int i;
for (i = 0; i < 3; i++)
dm9000_read_srom_word(i, dev->enetaddr + (2 * i));
#endif
}
/* /*
Read a byte from I/O port Read a byte from I/O port
*/ */
@ -621,6 +620,9 @@ int dm9000_initialize(bd_t *bis)
{ {
struct eth_device *dev = &(dm9000_info.netdev); struct eth_device *dev = &(dm9000_info.netdev);
/* Load MAC address from EEPROM */
dm9000_get_enetaddr(dev);
dev->init = dm9000_init; dev->init = dm9000_init;
dev->halt = dm9000_halt; dev->halt = dm9000_halt;
dev->send = dm9000_send; dev->send = dm9000_send;