diff options
| author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 13:46:21 -0500 |
|---|---|---|
| committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 13:46:21 -0500 |
| commit | 037af3481edfb2b7a3fbed1dffd277df25f677b9 (patch) | |
| tree | 2c39b8891b4494298b7ee447c480645d96e13bdb /drivers/dm9000x.c | |
| parent | ba999c531ed16ec749b2b6f4b0133cee38842b91 (diff) | |
Add Atmel AT91 patch version 1.5
This patch adds support for the following boards:
AT91RM9200-EK
AT91SAM9260-EK
AT91SAM9261-EK
AT91SAM9263-EK
AT91SAM9RL-EK
It was downloaded from http://www.linux4sam.org/twiki/pub/Linux4SAM/U-Boot/u-boot-1.1.5_atmel_1.5.diff.bz2
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'drivers/dm9000x.c')
| -rw-r--r-- | drivers/dm9000x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dm9000x.c b/drivers/dm9000x.c index 687707627e..623f7f2fd9 100644 --- a/drivers/dm9000x.c +++ b/drivers/dm9000x.c @@ -300,8 +300,10 @@ eth_init(bd_t * bd) DM9000_iow(DM9000_ISR, 0x0f); /* Clear interrupt status */ /* Set Node address */ +#ifndef CONFIG_AT91SAM9261EK for (i = 0; i < 6; i++) ((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i); +#endif printf("MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", bd->bi_enetaddr[0], bd->bi_enetaddr[1], bd->bi_enetaddr[2], bd->bi_enetaddr[3], bd->bi_enetaddr[4], bd->bi_enetaddr[5]); @@ -319,10 +321,10 @@ eth_init(bd_t * bd) DM9000_iow(DM9000_RCR, RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN); /* RX enable */ DM9000_iow(DM9000_IMR, IMR_PAR); /* Enable TX/RX interrupt mask */ i = 0; - while (!(phy_read(1) & 0x20)) { /* autonegation complete bit */ + while (!(phy_read(1) & 0x20)) { /* autonegotiation complete bit */ udelay(1000); i++; - if (i == 10000) { + if (i == 3000) { /* wait 3 seconds */ printf("could not establish link\n"); return 0; } |