GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mpc512x_fec: Move PHY initialization from probe into init routine.

Browse source 
This saves the autonegotation delay when not using ethernet in U-Boot

Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Detlev Zundel 2010-04-08 11:49:59 +02:00 • committed by Ben Warren
parent 910119b3c4
commit 5525856d59
1 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/net/mpc512x_fec.c
View file

@ -160,7 +160,7 @@ static void mpc512x_fec_tbd_scrub (mpc512x_fec_priv *fec)
} }
/********************************************************************/ /********************************************************************/
static void mpc512x_fec_set_hwaddr (mpc512x_fec_priv *fec, char *mac) static void mpc512x_fec_set_hwaddr (mpc512x_fec_priv *fec, unsigned char *mac)
{ {
u8 currByte; /* byte for which to compute the CRC */ u8 currByte; /* byte for which to compute the CRC */
int byte; /* loop - counter */ int byte; /* loop - counter */
@ -226,6 +226,12 @@ static int mpc512x_fec_init (struct eth_device *dev, bd_t * bis)
printf ("mpc512x_fec_init... Begin\n"); printf ("mpc512x_fec_init... Begin\n");
#endif #endif
mpc512x_fec_set_hwaddr (fec, dev->enetaddr);
out_be32(&fec->eth->gaddr1, 0x00000000);
out_be32(&fec->eth->gaddr2, 0x00000000);
mpc512x_fec_init_phy (dev, bis);
/* Set interrupt mask register */ /* Set interrupt mask register */
out_be32(&fec->eth->imask, 0x00000000); out_be32(&fec->eth->imask, 0x00000000);
@ -611,8 +617,6 @@ int mpc512x_fec_initialize (bd_t * bis)
volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR; volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
mpc512x_fec_priv *fec; mpc512x_fec_priv *fec;
struct eth_device *dev; struct eth_device *dev;
int i;
char *tmp, *end, env_enetaddr[6];
void * bd; void * bd;
fec = (mpc512x_fec_priv *) malloc (sizeof(*fec)); fec = (mpc512x_fec_priv *) malloc (sizeof(*fec));
@ -663,25 +667,6 @@ int mpc512x_fec_initialize (bd_t * bis)
*/ */
out_be32(&fec->eth->ievent, 0xffffffff); out_be32(&fec->eth->ievent, 0xffffffff);
/*
* Try to set the mac address now. The fec mac address is
* a garbage after reset. When not using fec for booting
* the Linux fec driver will try to work with this garbage.
*/
tmp = getenv ("ethaddr");
if (tmp) {
for (i=0; i<6; i++) {
env_enetaddr[i] = tmp ? simple_strtoul (tmp, &end, 16) : 0;
if (tmp)
tmp = (*end) ? end+1 : end;
}
mpc512x_fec_set_hwaddr (fec, env_enetaddr);
out_be32(&fec->eth->gaddr1, 0x00000000);
out_be32(&fec->eth->gaddr2, 0x00000000);
}
mpc512x_fec_init_phy (dev, bis);
return 1; return 1;
} }