From: Jason McMullan <mcmullan@netapp.com>
Date: Mon, 9 Jun 2008 03:56:00 +0000 (-0400)
Subject: mips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environment
X-Git-Tag: v1.3.4-rc1~76^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e7c374529c87525c9aa463e0557c287887ae4e9e;p=u-boot

mips: When booting Linux images, add 'ethaddr' and 'eth1addr' to the environment

Add 'ethaddr' and 'eth1addr' to the Linux kernel environment if
they are set in the U-Boot environment.

Signed-off-by: Jason McMullan <mcmullan@netapp.com>
Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---

diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index f813fc5831..8fe3782b75 100644
--- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c
@@ -54,6 +54,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 	char	*commandline = getenv ("bootargs");
 	char	env_buf[12];
 	int	ret;
+	const char *cp;
 
 	/* find kernel entry point */
 	if (images->legacy_hdr_valid) {
@@ -113,6 +114,16 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
 	sprintf (env_buf, "0x%X", (uint) (gd->bd->bi_flashsize));
 	linux_env_set ("flash_size", env_buf);
 
+	cp = getenv("ethaddr");
+	if (cp != NULL) {
+		linux_env_set("ethaddr", cp);
+	}
+
+	cp = getenv("eth1addr");
+	if (cp != NULL) {
+		linux_env_set("eth1addr", cp);
+	}
+
 	if (!images->autostart)
 		return ;