From: Dan Murphy <dmurphy@ti.com>
Date: Wed, 2 Oct 2013 19:00:15 +0000 (-0500)
Subject: ARM: fdt support: Add usbethaddr as an acceptable MAC
X-Git-Tag: v2014.07-rc4~64
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b1f49ab8c7bad60426b30c134ae065ef77d2dfc1;p=u-boot

ARM: fdt support: Add usbethaddr as an acceptable MAC

A board that has a USB ethernet device only may set the usbetheraddr
and not the ethaddr.
ethaddr will be the default MAC address that is chosen and if that
is not populated then the usbethaddr is looked at.  If neither are set
then then device tree blob is not modified.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
---

diff --git a/common/fdt_support.c b/common/fdt_support.c
index fcd252336c..c690768572 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -479,8 +479,18 @@ 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);