From: Ben Warren <biggerbadderben@gmail.com>
Date: Mon, 9 Jun 2008 05:04:22 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot
X-Git-Tag: v1.3.4-rc1~108^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e44f3ea4e801d37ef293284cb57b9637382f211a;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot
---

e44f3ea4e801d37ef293284cb57b9637382f211a
diff --cc drivers/net/dm9000x.c
index c2144d9bc6,68901cd818..fa95a730c3
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@@ -456,26 -289,21 +456,28 @@@ eth_init(bd_t * bd
  	/* Set PHY */
  	set_PHY_mode();
  
 -	/* Program operating register */
 -	DM9000_iow(DM9000_NCR, 0x0);	/* only intern phy supported by now */
 -	DM9000_iow(DM9000_TCR, 0);	/* TX Polling clear */
 -	DM9000_iow(DM9000_BPTR, 0x3f);	/* Less 3Kb, 200us */
 -	DM9000_iow(DM9000_FCTR, FCTR_HWOT(3) | FCTR_LWOT(8));	/* Flow Control : High/Low Water */
 -	DM9000_iow(DM9000_FCR, 0x0);	/* SH FIXME: This looks strange! Flow Control */
 -	DM9000_iow(DM9000_SMCR, 0);	/* Special Mode */
 -	DM9000_iow(DM9000_NSR, NSR_WAKEST | NSR_TX2END | NSR_TX1END);	/* clear TX status */
 -	DM9000_iow(DM9000_ISR, 0x0f);	/* Clear interrupt status */
 +	/* Program operating register, only intern phy supported by now */
 +	DM9000_iow(DM9000_NCR, 0x0);
 +	/* TX Polling clear */
 +	DM9000_iow(DM9000_TCR, 0);
 +	/* Less 3Kb, 200us */
 +	DM9000_iow(DM9000_BPTR, 0x3f);
 +	/* Flow Control : High/Low Water */
 +	DM9000_iow(DM9000_FCTR, FCTR_HWOT(3) | FCTR_LWOT(8));
 +	/* SH FIXME: This looks strange! Flow Control */
 +	DM9000_iow(DM9000_FCR, 0x0);
 +	/* Special Mode */
 +	DM9000_iow(DM9000_SMCR, 0);
 +	/* clear TX status */
 +	DM9000_iow(DM9000_NSR, NSR_WAKEST | NSR_TX2END | NSR_TX1END);
 +	/* Clear interrupt status */
 +	DM9000_iow(DM9000_ISR, 0x0f);
  
  	/* 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)) {