* 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)
diff --git a/CHANGELOG b/CHANGELOG
index b74e4b2..235852a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
Changes since U-Boot 1.1.1:
======================================================================
+* 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)
+
* Fix minor NAND JFFS2 related issue
* Fixes for SL811 USB controller:
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 @@
* 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;
}
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 66e5282..a7d30f0 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -30,7 +30,7 @@
*/
#define CONFIG_MPC5200
-#define CONFIG_MPC5XXX 1 /* This is an MPC5xxx CPU */
+#define CONFIG_MPC5xxx 1 /* This is an MPC5xxx CPU */
#define CONFIG_PM520 1 /* ... on PM520 board */
#define CFG_MPC5XXX_CLKIN 33000000 /* ... running at 33MHz */
@@ -184,8 +184,11 @@
/*
* Ethernet configuration
*/
-#define CONFIG_MPC5XXX_FEC 1
-#define CONFIG_FEC_10MBIT 1 /* Workaround for FEC 100Mbit problem */
+#define CONFIG_MPC5xxx_FEC 1
+/*
+ * Define CONFIG_FEC_10MBIT to force FEC at 10Mb
+ */
+/* #define CONFIG_FEC_10MBIT 1 */
#define CONFIG_PHY_ADDR 0x00
/*