diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-15 00:23:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-15 00:23:53 +0200 |
| commit | e73865897fe9e2b111d7f9ef32fe428438771b11 (patch) | |
| tree | 43416206dbc28a9e6ec7faa2a89b42aad44adcff /cpu | |
| parent | abca901869c3760b6c5fecb825db6c1d91a78a93 (diff) | |
| parent | f0da1d1b3c0719ea3b6025fe87b66224a466100d (diff) | |
| download | u-boot-imx-e73865897fe9e2b111d7f9ef32fe428438771b11.zip u-boot-imx-e73865897fe9e2b111d7f9ef32fe428438771b11.tar.gz u-boot-imx-e73865897fe9e2b111d7f9ef32fe428438771b11.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index e59bd85..00e8911 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -395,7 +395,9 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) { mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv; +#ifndef CONFIG_MOTIONPRO const uint8 phyAddr = CONFIG_PHY_ADDR; /* Only one PHY */ +#endif /* !CONFIG_MOTIONPRO */ #if (DEBUG & 0x1) printf ("mpc5xxx_fec_init_phy... Begin\n"); @@ -428,6 +430,14 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) */ fec->eth->imask = 0x00000000; +/* + * In original Promess-provided code PHY initialization is disabled with the + * following comment: "Phy initialization is DISABLED for now. There was a + * problem with running 100 Mbps on PRO board". Thus we temporarily disable + * PHY initialization for the Motion-PRO board, until a proper fix is found. + */ + +#ifndef CONFIG_MOTIONPRO if (fec->xcv_type != SEVENWIRE) { /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock @@ -554,6 +564,7 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) } } +#endif /* !CONFIG_MOTIONPRO */ #if (DEBUG & 0x2) if (fec->xcv_type != SEVENWIRE) |