[U-Boot] [PATCH] net, fec_mxc: use mac address stored in env before looking in eeprom

[Detlev Zundel <dzu@denx.de>]

Hi Stefano,

> Heiko Schocher wrote:
>
> Hi Heiko,
>
>> 
>> Signed-off-by: Heiko Schocher <hs@denx.de>
>> ---
>>  drivers/net/fec_mxc.c |   15 +++++++++++----
>>  1 files changed, 11 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
>> index 5af9cdb..b5245ec 100644
>> --- a/drivers/net/fec_mxc.c
>> +++ b/drivers/net/fec_mxc.c
>> @@ -749,11 +749,18 @@ static int fec_probe(bd_t *bd)
>> 
>>  	eth_register(edev);
>> 
>> -	if (fec_get_hwaddr(edev, ethaddr) == 0) {
>> -		printf("got MAC address from EEPROM: %pM\n", ethaddr);
>> -		memcpy(edev->enetaddr, ethaddr, 6);
>> -		fec_set_hwaddr(edev);
>> +	if (!eth_getenv_enetaddr("ethaddr", ethaddr)) {
>> +		/* "ethaddr" is not set in the environment */
>> +		if (fec_get_hwaddr(edev, ethaddr) == 0) {
>> +			printf("got MAC address from EEPROM: %pM\n", ethaddr);
>> +			eth_setenv_enetaddr("ethaddr", ethaddr);
>> +		} else {
>> +			printf ("no MAC found\n");
>> +			return -1;
>> +		}
>>  	}
>> +	memcpy(edev->enetaddr, ethaddr, 6);
>> +	fec_set_hwaddr(edev);
>> 
>>  	return 0;
>>  }
>
> As I understood Ben's comment on my last patch, the driver must not
> touch any environment variable, that is it must not call any
> getenv/setenv function.
>
> See http://www.mail-archive.com/u-boot at lists.denx.de/msg28329.html

Hm, maybe this needs to be discussed again.

What Heiko _really_ fixes is that the board has a problem with linux
when no network transfer was done in U-Boot.  Looking at the code, this
is quite obvious as this special driver does not program any mac address
into the controller when no EEPROM mac is found.

No one could argue that Linux should initialize that, but given our
failed attempts to fix such things in the ARM linux tree, I looked for
another solution.  

Looking into our network code again I found doc/README.drivers.eth.  It
is explicitely allowed in this document to program a mac address into
the controller.  Now on the other hand if we have "ethaddr" override any
other settings, I fail to see how we should do this without using a
getenv call.

So maybe Ben _will_ allow this construct after all.

Cheers
  Detlev

-- 
Basically,  Barnes & Noble separates things by how old they are  -- current
stuff is "Fiction", stuff from 20 years ago is "Literature", stuff from 100
years ago is "Classics", stuff from 400 years ago is "Shakespeare" [..] and
stuff from 2000 years ago is "History".
                     -- James "Kibo" Parry in <kibo-1207032212000001@10.0.1.2>
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de