summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/utils.c
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-11-23 13:14:17 +0000
committerTom Rini <trini@konsulko.com>2017-12-02 18:32:58 -0500
commitb59670f2bd028b682cfab88a9c8e980a968f24bd (patch)
tree92bd992dce8feaad45648cc3246b39bb5ab6b752 /arch/arm/mach-omap2/utils.c
parent02907004294d981fff9a7305ad9c6d8a0138f205 (diff)
omap2: set the ethaddr as well as the usbethaddr env var to ensure static MAC
The kernel gets the ethernet MAC from the ethaddr variable, the omap boards for devices with USB based eth adapters just set the usbethaddr which doesn't appear to get passed to the kernel. The same Raspberry Pi code sets both ethaddr and usbethaddr so lets do that so linux (tested 4.13 and 4.14) get a static rather than a random MAC address, while not regressing users of usbethaddr. Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'arch/arm/mach-omap2/utils.c')
-rw-r--r--arch/arm/mach-omap2/utils.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index 2e8778043b..d11670c0ee 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -215,6 +215,9 @@ void omap_die_id_usbethaddr(void)
mac[5] = (die_id[0] >> 8) & 0xff;
eth_env_set_enetaddr("usbethaddr", mac);
+
+ if (!env_get("ethaddr"))
+ eth_env_set_enetaddr("ethaddr", mac);
}
}