X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fkeymile%2Fcommon%2Fivm.c;h=70d78457f25e8ab108a1ed282dbceccd5a93a13f;hb=2a7714ce64cfd954535f0c96f2809e2fd80d84f0;hp=d0cb0d227f198e1873f84e833dc31cda9905d783;hpb=4f745bf4c8d8fa44ce640e551be974808a529889;p=u-boot

diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c
index d0cb0d227f..70d78457f2 100644
--- a/board/keymile/common/ivm.c
+++ b/board/keymile/common/ivm.c
@@ -206,8 +206,8 @@ static int ivm_analyze_block2(unsigned char *buf, int len)
 	unsigned char	valbuf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN];
 	unsigned long	count;
 
-	/* IVM_MacAddress */
-	sprintf((char *)valbuf, "%pM", buf);
+	/* IVM_MAC Adress begins at offset 1 */
+	sprintf((char *)valbuf, "%pM", buf + 1);
 	ivm_set_value("IVM_MacAddress", (char *)valbuf);
 	/* if an offset is defined, add it */
 #if defined(CONFIG_PIGGY_MAC_ADRESS_OFFSET)
@@ -221,7 +221,12 @@ static int ivm_analyze_block2(unsigned char *buf, int len)
 		sprintf((char *)valbuf, "%pM", buf);
 	}
 #endif
+#ifdef MACH_TYPE_KM_KIRKWOOD
 	setenv((char *)"ethaddr", (char *)valbuf);
+#else
+	if (getenv("ethaddr") == NULL)
+		setenv((char *)"ethaddr", (char *)valbuf);
+#endif
 
 	/* IVM_MacCount */
 	count = (buf[10] << 24) +