From: Holger Brunck <holger.brunck@keymile.com>
Date: Sun, 5 Jun 2011 22:22:16 +0000 (+0000)
Subject: km/common: force set ethaddr after reading IVM
X-Git-Tag: v2011.09-rc1~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e8195825716c0ef8cfaea513c8a3d9d3becf7e00;p=u-boot

km/common: force set ethaddr after reading IVM

The ethaddr is stored inside the inventory eeprom. During
boottime this value was read out and the ethaddr variable was
set. Previously this was only done if it ethaddr == NULL but
this is wrong for our ARM boards. Because ethaddr is at this
stage never NULL for ARM due to the random calculation of a
MAC address in mvgbe.c.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
---

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 9be4c728bf..fef62534b4 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -278,8 +278,7 @@ static int ivm_analyze_block2(unsigned char *buf, int len)
 		sprintf((char *)valbuf, "%pM", buf);
 	}
 #endif
-	if (getenv("ethaddr") == NULL)
-		setenv((char *)"ethaddr", (char *)valbuf);
+	setenv((char *)"ethaddr", (char *)valbuf);
 
 	/* IVM_MacCount */
 	count = (buf[10] << 24) +