projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot into x1
[oweals/u-boot.git]
/
board
/
evb64260
/
eth.c
diff --git
a/board/evb64260/eth.c
b/board/evb64260/eth.c
index add2b3df534c379a3a064f42d6c32c75998683a5..ca8bab52d96613c9d416a9d0f6ac36d9596629e1 100644
(file)
--- a/
board/evb64260/eth.c
+++ b/
board/evb64260/eth.c
@@
-27,6
+27,7
@@
Skeleton NIC driver for Etherboot
#include <asm/cache.h>
#include <miiphy.h>
#include <net.h>
#include <asm/cache.h>
#include <miiphy.h>
#include <net.h>
+#include <netdev.h>
#include "eth.h"
#include "eth_addrtbl.h"
#include "eth.h"
#include "eth_addrtbl.h"
@@
-163,7
+164,7
@@
gt6426x_eth_receive(struct eth_dev_s *p,unsigned int icr)
int eth_len=0;
char *eth_data;
int eth_len=0;
char *eth_data;
- eth0_rx_desc_single *rx
=
&p->eth_rx_desc[(p->rdn)];
+ eth0_rx_desc_single *rx
=
&p->eth_rx_desc[(p->rdn)];
INVALIDATE_DCACHE((unsigned int)rx,(unsigned int)(rx+1));
INVALIDATE_DCACHE((unsigned int)rx,(unsigned int)(rx+1));
@@
-252,7
+253,7
@@
gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s)
#ifdef DEBUG
unsigned int old_command_stat,old_psr;
#endif
#ifdef DEBUG
unsigned int old_command_stat,old_psr;
#endif
- eth0_tx_desc_single *tx
=
&dev->eth_tx_desc[dev->tdn];
+ eth0_tx_desc_single *tx
=
&dev->eth_tx_desc[dev->tdn];
/* wait for tx to be ready */
INVALIDATE_DCACHE((unsigned int)tx,(unsigned int)(tx+1));
/* wait for tx to be ready */
INVALIDATE_DCACHE((unsigned int)tx,(unsigned int)(tx+1));
@@
-529,7
+530,7
@@
gt6426x_eth_probe(void *v, bd_t *bis)
#endif
/* 31 28 27 24 23 20 19 16
#endif
/* 31 28 27 24 23 20 19 16
- * 0000 0000 0000 0000 [0004]
+ * 0000 0000 0000 0000 [0004]
* 15 12 11 8 7 4 3 0
* 1000 1101 0000 0000 [4d00]
* 20 - 0=MII 1=RMII
* 15 12 11 8 7 4 3 0
* 1000 1101 0000 0000 [4d00]
* 20 - 0=MII 1=RMII