summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-03 23:03:54 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-03 23:03:54 +0200
commit6dfa434e326babbf0209bfae01bb57424924d2a9 (patch)
treeb963866b93f35aa95099fa44366bd1d0dc81d8cf
parent507d3b0cdef8ae85e3ad6a60ddde1c721f38b6bb (diff)
downloadu-boot-imx-6dfa434e326babbf0209bfae01bb57424924d2a9.zip
u-boot-imx-6dfa434e326babbf0209bfae01bb57424924d2a9.tar.gz
u-boot-imx-6dfa434e326babbf0209bfae01bb57424924d2a9.tar.bz2
Ignore broadcast status bit in received frames in 8260 FCC ethernet
loopback test code Patch by Murray Jensen, 18 Jul 2005
-rw-r--r--CHANGELOG4
-rw-r--r--cpu/mpc8260/ether_fcc.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d5139ea..b0b0c58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
Changes for U-Boot 1.1.3:
======================================================================
+* Ignore broadcast status bit in received frames in 8260 FCC ethernet
+ loopback test code
+ Patch by Murray Jensen, 18 Jul 2005
+
* Fix typo in mkconfig script (used == instead of =)
Patch by Murray Jensen, 18 Jul 2005
diff --git a/cpu/mpc8260/ether_fcc.c b/cpu/mpc8260/ether_fcc.c
index 82f7390..0393afa 100644
--- a/cpu/mpc8260/ether_fcc.c
+++ b/cpu/mpc8260/ether_fcc.c
@@ -628,6 +628,9 @@ 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)
{
@@ -1002,7 +1005,7 @@ eth_loopback_test (void)
ecp->rxeacc._f++;
}
- if (sc & BD_ENET_RX_STATS) {
+ if (sc & BD_ENET_RX_ERRS) {
ulong n;
/*
@@ -1033,7 +1036,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;