diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:33:40 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:33:40 +0100 |
| commit | 8d54477b9bfc666632e767946ea190fc6ce52775 (patch) | |
| tree | ea2c4f3cc3b1c5b0cfe95b346a72138a142f63cf /lib_avr32 | |
| parent | e57ed96baca1222e6cd3d7032691a89d5890bb4a (diff) | |
| parent | 6b4439444286e0fcd01596df504e6ca897ad3e5a (diff) | |
| download | u-boot-imx-8d54477b9bfc666632e767946ea190fc6ce52775.zip u-boot-imx-8d54477b9bfc666632e767946ea190fc6ce52775.tar.gz u-boot-imx-8d54477b9bfc666632e767946ea190fc6ce52775.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
Diffstat (limited to 'lib_avr32')
| -rw-r--r-- | lib_avr32/board.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib_avr32/board.c b/lib_avr32/board.c index 809ee3b..d6423d4 100644 --- a/lib_avr32/board.c +++ b/lib_avr32/board.c @@ -264,6 +264,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) #ifndef CFG_ENV_IS_NOWHERE extern char * env_name_spec; #endif + char *s; cmd_tbl_t *cmdtp; bd_t *bd; @@ -336,11 +337,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) /* initialize environment */ env_relocate(); + bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); + devices_init(); jumptable_init(); console_init_r(); + s = getenv("loadaddr"); + if (s) + load_addr = simple_strtoul(s, NULL, 16); + #if defined(CONFIG_CMD_NET) + s = getenv("bootfile"); + if (s) + copy_filename(BootFile, s, sizeof(BootFile)); #if defined(CONFIG_NET_MULTI) puts("Net: "); #endif |