diff options
| author | wdenk <wdenk> | 2004-04-08 22:31:29 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-08 22:31:29 +0000 |
| commit | 7e780369e43ebf5c9e337dfad84dd36b2a08a21f (patch) | |
| tree | 0e30d6ce7632bf4b01394224bc1aa85f5610b77e /cpu/mpc5xxx | |
| parent | 0608e04da9d0df5d00cf48a1d9141e2ea1bc9635 (diff) | |
| download | u-boot-imx-7e780369e43ebf5c9e337dfad84dd36b2a08a21f.zip u-boot-imx-7e780369e43ebf5c9e337dfad84dd36b2a08a21f.tar.gz u-boot-imx-7e780369e43ebf5c9e337dfad84dd36b2a08a21f.tar.bz2 | |
* Patch by Mark Jonas: Remove config.tmp files only when
unconfiguring the board
* Adapt RMU board for bigger flash memory
* Test fix for ethernet problems on MPC5200
Diffstat (limited to 'cpu/mpc5xxx')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 6e20faa..1df394a 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -286,16 +286,8 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) fec->eth->r_cntrl = 0x05ee0024; /*0x05ee0004;FIXME */ } - if (fec->xcv_type == SEVENWIRE) { - /* - * Set FEC-Lite transmit control register(X_CNTRL): - */ - /*fec->eth->x_cntrl = 0x00000002; */ /* half-duplex, heartbeat */ - fec->eth->x_cntrl = 0x00000000; /* half-duplex, heartbeat disabled */ - } else { - /*fec->eth->x_cntrl = 0x00000006; */ /* full-duplex, heartbeat */ - fec->eth->x_cntrl = 0x00000004; /* full-duplex, heartbeat disabled */ - + fec->eth->x_cntrl = 0x00000000; /* half-duplex, heartbeat disabled */ + if (fec->xcv_type != SEVENWIRE) { /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock * and do not drop the Preamble. @@ -485,7 +477,7 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) #endif return -1; } - } while ((phyStatus & 0x0020) != 0x0020); + } while (!(phyStatus & 0x0004)); #if (DEBUG & 0x2) printf("PHY auto neg complete! \n"); |