diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-03 00:24:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-03 00:24:36 +0200 |
| commit | 912810eeca90eedd1503f5e883f3a8da39d7ff89 (patch) | |
| tree | 56d7a80b4d10e12e088eb51ad4aeb0fa22d0ed7a /drivers/net | |
| parent | 7a68389a231ac061ba2ffd628f86e15ed0545a7b (diff) | |
| parent | 602cac1389b755b223272f2328a47e6f8c240848 (diff) | |
| download | u-boot-imx-912810eeca90eedd1503f5e883f3a8da39d7ff89.zip u-boot-imx-912810eeca90eedd1503f5e883f3a8da39d7ff89.tar.gz u-boot-imx-912810eeca90eedd1503f5e883f3a8da39d7ff89.tar.bz2 | |
Merge remote branch 'u-boot-at91/for-1.3.4'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dm9000x.c | 2 | ||||
| -rw-r--r-- | drivers/net/macb.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 01e2f14..68901cd 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/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 if (is_zero_ether_addr(bd->bi_enetaddr) || is_multicast_ether_addr(bd->bi_enetaddr)) { diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 703784e..e5733f6 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -417,13 +417,15 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) /* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) +#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ + defined(CONFIG_AT91SAM9263) macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, 0); #endif #else -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) +#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ + defined(CONFIG_AT91SAM9263) macb_writel(macb, USRIO, MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, MACB_BIT(MII)); |