summaryrefslogtreecommitdiff
path: root/cpu/mpc8xx/fec.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-05-05 08:31:53 +0000
committerwdenk <wdenk>2004-05-05 08:31:53 +0000
commit62b4ac98a46cd091042b8d2801cb989a8c7c538d (patch)
treedb80c4bd9f73803534d9171d342303ff1c478d58 /cpu/mpc8xx/fec.c
parent2729af9d544bfba5de47698c2852652d95723943 (diff)
downloadu-boot-imx-62b4ac98a46cd091042b8d2801cb989a8c7c538d.zip
u-boot-imx-62b4ac98a46cd091042b8d2801cb989a8c7c538d.tar.gz
u-boot-imx-62b4ac98a46cd091042b8d2801cb989a8c7c538d.tar.bz2
* Fix config option spelling in PM520 config file
* Fix PHY discovery problem in cpu/mpc8xx/fec.c (introduced by patches by Pantelis Antoniou, 30 Mar 2004)
Diffstat (limited to 'cpu/mpc8xx/fec.c')
-rw-r--r--cpu/mpc8xx/fec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpu/mpc8xx/fec.c b/cpu/mpc8xx/fec.c
index 34a4b20..39fe690 100644
--- a/cpu/mpc8xx/fec.c
+++ b/cpu/mpc8xx/fec.c
@@ -689,13 +689,14 @@ static int fec_init (struct eth_device *dev, bd_t * bd)
* wait for the PHY to wake up after reset
*/
efis->actual_phy_addr = mii_discover_phy (dev);
-#else
- efis->actual_phy_addr = -1;
-#endif
+
if (efis->actual_phy_addr == -1) {
printf ("Unable to discover phy!\n");
return 0;
}
+#else
+ efis->actual_phy_addr = -1;
+#endif
} else {
efis->actual_phy_addr = efis->phy_addr;
}