summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-05 11:22:28 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-05 11:22:28 +0200
commitcbf9c117282b8729bdb86071997b58fcab58c444 (patch)
treeff9175f1d987c49ef8b3b334bffae4f35ca8b759 /cpu
parenta99a0a98b9fcf78ee2ceda893e8d4bd9b11e427a (diff)
parent2c61f14c60ccc5a1c90205991bf555872887a831 (diff)
downloadu-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.zip
u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.tar.gz
u-boot-imx-cbf9c117282b8729bdb86071997b58fcab58c444.tar.bz2
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc8260/ether_fcc.c7
-rw-r--r--cpu/mpc85xx/start.S4
2 files changed, 7 insertions, 4 deletions
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;
diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S
index fc869a3..5f75bc1 100644
--- a/cpu/mpc85xx/start.S
+++ b/cpu/mpc85xx/start.S
@@ -209,8 +209,8 @@ _start_e500:
li r1,0x0b00
mtspr IVOR11,r1 /* 11: Interval timer */
li r1,0x0c00
- mtspr IVOR12,r1 /* 11: Watchdog timer */
- li r10,0x0d00
+ mtspr IVOR12,r1 /* 12: Watchdog timer */
+ li r1,0x0d00
mtspr IVOR13,r1 /* 13: Data TLB error */
li r1,0x0e00
mtspr IVOR14,r1 /* 14: Instruction TLB error */