From b63d4f34d06e1d08571a9a2649d9f9ec0dbd806c Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Thu, 13 Jul 2017 11:15:40 +0200 Subject: km/ivm: always set ethaddr after reading IVM 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 Signed-off-by: Holger Brunck --- board/keymile/common/ivm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 42db54221b..3495fafffe 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -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; -- cgit v1.2.3