public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot-Users] [PATCH] DM9000 driver
@ 2007-08-21 10:51 stefano babic
  2007-08-21 13:25 ` Ben Warren
  0 siblings, 1 reply; 4+ messages in thread
From: stefano babic @ 2007-08-21 10:51 UTC (permalink / raw)
  To: u-boot

The logic to check if there is a correct MAC address in the DM9000 
EEPROM, added in the last patch, is wrong.
Now the MAC address is always taken from the environment, even if a 
suitable MAC is present in the EEPROM.

Signed-off-by: Stefano Babic <sbabic@denx.de>

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
-------------- next part --------------
A non-text attachment was scrubbed...
Name: DM9000-EEPROM.diff
Type: text/x-patch
Size: 1317 bytes
Desc: not available
Url : http://lists.denx.de/pipermail/u-boot/attachments/20070821/42f959b3/attachment.bin 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot-Users] [PATCH] DM9000 driver
  2007-08-21 10:51 [U-Boot-Users] [PATCH] DM9000 driver stefano babic
@ 2007-08-21 13:25 ` Ben Warren
  2007-08-21 13:50   ` stefano babic
  0 siblings, 1 reply; 4+ messages in thread
From: Ben Warren @ 2007-08-21 13:25 UTC (permalink / raw)
  To: u-boot

stefano babic wrote:
> The logic to check if there is a correct MAC address in the DM9000 
> EEPROM, added in the last patch, is wrong.
> Now the MAC address is always taken from the environment, even if a 
> suitable MAC is present in the EEPROM.
>
> Signed-off-by: Stefano Babic <sbabic@denx.de>
>
>   
Your patch is backwards (stuff to remove should be - and to add should 
be +), and so won't apply.  The same goes for the TFTP one.
> ------------------------------------------------------------------------
>
> >From 432445542c9ebc11cc9d4ed4200de3671a2cf029 Mon Sep 17 00:00:00 2001
> From: Stefano Babic <sbabic@denx.de>
> Date: Tue, 21 Aug 2007 12:46:34 +0200
> Subject: [PATCH] The logic to check if there is a correct MAC address in the DM9000 EEPROM,
> added in the last patch, is wrong.
> Now the MAC address is always taken from the environment, even if a suitable MAC
> is present in the EEPROM. Time to wait reading the EEPROM is set to 8ms
> according to the linux driver
> ---
>  drivers/dm9000x.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/dm9000x.c b/drivers/dm9000x.c
> index e0d531b..78acb09 100644
> --- a/drivers/dm9000x.c
> +++ b/drivers/dm9000x.c
> @@ -303,8 +303,8 @@ eth_init(bd_t * bd)
>  	for (i = 0; i < 6; i++)
>  		((u16 *) bd->bi_enetaddr)[i] = read_srom_word(i);
>  
> -	if (is_zero_ether_addr(bd->bi_enetaddr) ||
> -	    is_multicast_ether_addr(bd->bi_enetaddr)) {
> +	if (!is_zero_ether_addr(bd->bi_enetaddr) &&
> +	    !is_mutlicast_ether_addr(bd->bi_enetaddr)) {
>  		/* try reading from environment */
>  		u8 i;
>  		char *s, *e;
> @@ -542,7 +542,7 @@ read_srom_word(int offset)
>  {
>  	DM9000_iow(DM9000_EPAR, offset);
>  	DM9000_iow(DM9000_EPCR, 0x4);
> -	udelay(8000);
> +	udelay(200);
>   
Does the 200us delay not work, or are you just doing this to match the 
Linux driver?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot-Users] [PATCH] DM9000 driver
  2007-08-21 13:25 ` Ben Warren
@ 2007-08-21 13:50   ` stefano babic
  2007-08-29  0:13     ` Wolfgang Denk
  0 siblings, 1 reply; 4+ messages in thread
From: stefano babic @ 2007-08-21 13:50 UTC (permalink / raw)
  To: u-boot

Ben Warren wrote:
> Your patch is backwards (stuff to remove should be - and to add should 
> be +), and so won't apply.  The same goes for the TFTP one.

Sorry, I submit the correct ones:

The logic to check if there is a correct MAC address in the DM9000 
EEPROM, added in the last patch, is wrong.
Now the MAC address is always taken from the environment, even if a 
suitable MAC is present in the EEPROM.

Signed-off-by: Stefano Babic <sbabic@denx.de>



-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-The-logic-to-check-if-there-is-a-correct-MAC-address-in-the-DM9000-EEPROM.txt
Url: http://lists.denx.de/pipermail/u-boot/attachments/20070821/94a30b7a/attachment.txt 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot-Users] [PATCH] DM9000 driver
  2007-08-21 13:50   ` stefano babic
@ 2007-08-29  0:13     ` Wolfgang Denk
  0 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2007-08-29  0:13 UTC (permalink / raw)
  To: u-boot

In message <46CAEDA9.7010100@denx.de> you wrote:
> This is a multi-part message in MIME format.
> --------------080308050605080402030006
> Content-Type: text/plain; charset=ISO-8859-1; format=flowed
> Content-Transfer-Encoding: 7bit
> 
> Ben Warren wrote:
> > Your patch is backwards (stuff to remove should be - and to add should 
> > be +), and so won't apply.  The same goes for the TFTP one.
> 
> Sorry, I submit the correct ones:
> 
> The logic to check if there is a correct MAC address in the DM9000 
> EEPROM, added in the last patch, is wrong.
> Now the MAC address is always taken from the environment, even if a 
> suitable MAC is present in the EEPROM.
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Don't you know anything? I should have thought anyone knows that  who
knows anything about anything...      - Terry Pratchett, _Soul Music_

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-08-29  0:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-21 10:51 [U-Boot-Users] [PATCH] DM9000 driver stefano babic
2007-08-21 13:25 ` Ben Warren
2007-08-21 13:50   ` stefano babic
2007-08-29  0:13     ` Wolfgang Denk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox