From: Peter Robinson Date: Thu, 23 Nov 2017 13:14:17 +0000 (+0000) Subject: omap2: set the ethaddr as well as the usbethaddr env var to ensure static MAC X-Git-Tag: v2018.01-rc1~24 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b59670f2bd028b682cfab88a9c8e980a968f24bd;p=u-boot 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 --- 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); } }