summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-09 23:24:23 +0200
committerWolfgang Denk <wd@denx.de>2008-07-09 23:24:23 +0200
commita292d2265ef0463be4e7c4827a8a0dec556f0a88 (patch)
treecb9392d65f7e64050e48f2a425e31fb12fd4295f
parenteee62c74cb7f2414f329f00eae9b2bd92f9cbb83 (diff)
parente7c374529c87525c9aa463e0557c287887ae4e9e (diff)
downloadu-boot-imx-a292d2265ef0463be4e7c4827a8a0dec556f0a88.zip
u-boot-imx-a292d2265ef0463be4e7c4827a8a0dec556f0a88.tar.gz
u-boot-imx-a292d2265ef0463be4e7c4827a8a0dec556f0a88.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
-rw-r--r--lib_mips/bootm.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index f813fc5..8fe3782 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 ;