From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 11 Feb 2009 23:51:43 +0000 (-0500)
Subject: bootvx: get mac address from environment
X-Git-Tag: v2009.06-rc1~148^2~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=62c93d92f1b6266b2f33c5f403931b51cbd2a246;p=oweals%2Fu-boot.git

bootvx: get mac address from environment

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Niklaus Giger <niklaus.giger@member.fsf.org>
CC: Ben Warren <biggerbadderben@gmail.com>
---

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 19e12493a2..4a3fff1e86 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -131,10 +131,12 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 #if defined(CONFIG_WALNUT)
 	tmp = (char *) CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
-	memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[3], 3);
+	eth_getenv_enetaddr("ethaddr", build_buf);
+	memcpy(tmp, &build_buf[3], 3);
 #elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
 	tmp = (char *) CONFIG_SYS_VXWORKS_MAC_PTR;
-	memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6);
+	eth_getenv_enetaddr("ethaddr", build_buf);
+	memcpy(tmp, build_buf, 6);
 #else
 	puts ("## Ethernet MAC address not copied to NV RAM\n");
 #endif