Merge branch 'master' of git://www.denx.de/git/u-boot-mips
This commit is contained in:
commit
a292d2265e
|
@ -54,6 +54,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
|
||||||
char *commandline = getenv ("bootargs");
|
char *commandline = getenv ("bootargs");
|
||||||
char env_buf[12];
|
char env_buf[12];
|
||||||
int ret;
|
int ret;
|
||||||
|
const char *cp;
|
||||||
|
|
||||||
/* find kernel entry point */
|
/* find kernel entry point */
|
||||||
if (images->legacy_hdr_valid) {
|
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));
|
sprintf (env_buf, "0x%X", (uint) (gd->bd->bi_flashsize));
|
||||||
linux_env_set ("flash_size", env_buf);
|
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)
|
if (!images->autostart)
|
||||||
return ;
|
return ;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue