Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[u-boot] / cpu / mpc8260 / ether_fcc.c

diff --git a/cpu/mpc8260/ether_fcc.c b/cpu/mpc8260/ether_fcc.c
index 82f73907099c05dd745a99086e8a7b57767bd7b9..37bf4456ed1b032a892abced7dffb7c138943d39 100644 (file)
--- a/cpu/mpc8260/ether_fcc.c
+++ b/cpu/mpc8260/ether_fcc.c
@@ -47,7 +47,13 @@
 #include <config.h>
 #include <net.h>
 
-#if defined(CONFIG_ETHER_ON_FCC) && (CONFIG_COMMANDS & CFG_CMD_NET) && \
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
+#include <miiphy.h>
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET) && \
        defined(CONFIG_NET_MULTI)
 
 static struct ether_fcc_info_s
@@ -386,6 +392,12 @@ int fec_initialize(bd_t *bis)
                dev->recv   = fec_recv;
 
                eth_register(dev);
+
+#if (defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) \
+               && defined(CONFIG_BITBANGMII)
+               miiphy_register(dev->name,
+                               bb_miiphy_read, bb_miiphy_write);
+#endif
        }
 
        return 1;
@@ -628,11 +640,12 @@ swap16 (unsigned short x)
        return (((x & 0xff) << 8) | ((x & 0xff00) >> 8));
 }
 
+/* broadcast is not an error - we send them like that */
+#define BD_ENET_RX_ERRS        (BD_ENET_RX_STATS & ~BD_ENET_RX_BC)
+
 void
 eth_loopback_test (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        volatile immap_t *immr = (immap_t *)CFG_IMMR;
        volatile cpm8260_t *cp = &(immr->im_cpm);
        int c, nclosed;
@@ -1002,7 +1015,7 @@ eth_loopback_test (void)
                                                        ecp->rxeacc._f++;
                                        }
 
-                                       if (sc & BD_ENET_RX_STATS) {
+                                       if (sc & BD_ENET_RX_ERRS) {
                                                ulong n;
 
                                                /*
@@ -1033,7 +1046,7 @@ eth_loopback_test (void)
                                                        ecp->rxeacc.cl++;
 
                                                bdp->cbd_sc &= \
-                                                       ~BD_ENET_RX_STATS;
+                                                       ~BD_ENET_RX_ERRS;
                                        }
                                        else {
                                                ushort datlen = bdp->cbd_datlen;
@@ -1174,4 +1187,4 @@ eth_loopback_test (void)
 
 #endif /* CONFIG_ETHER_LOOPBACK_TEST */
 
-#endif /* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
+#endif