]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
km/ivm: always set ethaddr after reading IVM
authorHolger Brunck <holger.brunck@keymile.com>
Thu, 13 Jul 2017 09:15:40 +0000 (11:15 +0200)
committerTom Rini <trini@konsulko.com>
Sun, 23 Jul 2017 02:22:46 +0000 (22:22 -0400)
If we rebrand the IVM and ethaddr was set previously we need to change
ethaddr. Otherwise we end up with a wrong MAC adress for the ethernet
interface.

Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
board/keymile/common/ivm.c

index 42db54221bb34dc30966304cba6bdb822842fc47..3495fafffe6a5e9b579d99e16e54643474ebca78 100644 (file)
@@ -302,14 +302,11 @@ static int ivm_populate_env(unsigned char *buf, int len)
 
        /* if an offset is defined, add it */
        process_mac(valbuf, page2, CONFIG_PIGGY_MAC_ADRESS_OFFSET);
-       if (getenv("ethaddr") == NULL)
-               setenv((char *)"ethaddr", (char *)valbuf);
+       setenv((char *)"ethaddr", (char *)valbuf);
 #ifdef CONFIG_KMVECT1
 /* KMVECT1 has two ethernet interfaces */
-       if (getenv("eth1addr") == NULL) {
-               process_mac(valbuf, page2, 1);
-               setenv((char *)"eth1addr", (char *)valbuf);
-       }
+       process_mac(valbuf, page2, 1);
+       setenv((char *)"eth1addr", (char *)valbuf);
 #endif
 
        return 0;