diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-11-03 04:24:40 -0800 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-12-21 19:55:27 -0600 |
| commit | 52d825cc7b9d50f286cdbd026733bb15e81d3c66 (patch) | |
| tree | 9da9900d264eda9a1b58636dc9a9bb1e0f8a6764 /common/fdt_support.c | |
| parent | 4832e17787acb29734d895751bc7a594908aecc6 (diff) | |
| download | talos-obmc-uboot-52d825cc7b9d50f286cdbd026733bb15e81d3c66.tar.gz talos-obmc-uboot-52d825cc7b9d50f286cdbd026733bb15e81d3c66.zip | |
fdt: Deprecate "usbethaddr" usage in fdt_fixup_ethernet()
In fdt_fixup_ethernet() only "usbethaddr" is handled to fix up the
first usb ethernet port MAC address. Other additional usb ethernet
ports are ignored as there is no logic to handle "usbeth%daddr".
It is suggested we should use "ethaddr" for all ethernet devices.
Hence deprecate "usbethaddr" usage in fdt_fixup_ethernet().
This actually reverts commit b1f49ab8c7bad60426b30c134ae065ef77d2dfc1
"ARM: fdt support: Add usbethaddr as an acceptable MAC".
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
On OMAP4 Panda (+ v4.3 kernel)
Tested-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/fdt_support.c')
| -rw-r--r-- | common/fdt_support.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 66464dbfd8..ccad16facf 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -491,18 +491,8 @@ void fdt_fixup_ethernet(void *fdt) if (node < 0) return; - if (!getenv("ethaddr")) { - if (getenv("usbethaddr")) { - strcpy(mac, "usbethaddr"); - } else { - debug("No ethernet MAC Address defined\n"); - return; - } - } else { - strcpy(mac, "ethaddr"); - } - i = 0; + strcpy(mac, "ethaddr"); while ((tmp = getenv(mac)) != NULL) { sprintf(enet, "ethernet%d", i); path = fdt_getprop(fdt, node, enet, NULL); |
