summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-05-15 00:22:30 +0200
committerWolfgang Denk <wd@denx.de>2007-05-15 00:22:30 +0200
commitf0da1d1b3c0719ea3b6025fe87b66224a466100d (patch)
tree77149f58939338dc57c88813551b9d9d6691a1d8 /cpu
parentac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff)
parent7d98ba770a7eaefa29ce927f31a0956df85bf650 (diff)
downloadu-boot-imx-f0da1d1b3c0719ea3b6025fe87b66224a466100d.zip
u-boot-imx-f0da1d1b3c0719ea3b6025fe87b66224a466100d.tar.gz
u-boot-imx-f0da1d1b3c0719ea3b6025fe87b66224a466100d.tar.bz2
Merge with /home/tur/git/u-boot#motionpro
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc5xxx/fec.c11
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)