* 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 b74e4b29c92dfdddfa280d0427ccab484218d23a..235852a358bd49ea9754e9b102c52dc1f1620512 100644 (file)
--- 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 34a4b20a7af3755a981f8db988f8d0a2f7c601ed..39fe6903160bddf66c407f3cf044efc19ec1ac7e 100644 (file)
--- 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;
        }

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 66e52827c35850deff9eb15c57e8e1b7400c9c2b..a7d30f0d759317a361b4ab179baf695b739e281d 100644 (file)
--- 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
 
 /*