summaryrefslogtreecommitdiff
path: root/drivers/net/dm9000x.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-24 12:56:53 +0200
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-24 12:56:53 +0200
commit42fd5f87b1613d3039f57e93c16f760a768d3e84 (patch)
tree9dd0252fca37dbdb1148ce7fd44dc5c9dd8a6b34 /drivers/net/dm9000x.c
parent2c8d41969b47eb0b973912830c58689b2ba0e50a (diff)
parent54694a91428f6c3280fe1ee0923488a1e7e8dbc4 (diff)
downloadu-boot-imx-42fd5f87b1613d3039f57e93c16f760a768d3e84.zip
u-boot-imx-42fd5f87b1613d3039f57e93c16f760a768d3e84.tar.gz
u-boot-imx-42fd5f87b1613d3039f57e93c16f760a768d3e84.tar.bz2
Merging Stelian Pop AT91 patches
Merge branch 'testing-V2' Conflicts: board/atmel/at91cap9adk/Makefile Fixing copyright board/atmel/at91sam9260ek/Makefile Fixing copyright board/atmel/at91sam9260ek/u-boot.lds Delete no more needed ld script Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/net/dm9000x.c')
-rw-r--r--drivers/net/dm9000x.c2
1 files changed, 2 insertions, 0 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)) {