|
|
|
@ -87,13 +87,8 @@ ulong monitor_flash_len; |
|
|
|
|
|
|
|
|
|
static int init_baudrate(void) |
|
|
|
|
{ |
|
|
|
|
char tmp[64]; /* long enough for environment variables */ |
|
|
|
|
int i = getenv_f("baudrate", tmp, sizeof(tmp)); |
|
|
|
|
|
|
|
|
|
gd->baudrate = (i > 0) |
|
|
|
|
? (int)simple_strtoul(tmp, NULL, 10) |
|
|
|
|
: CONFIG_BAUDRATE; |
|
|
|
|
return (0); |
|
|
|
|
gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/***********************************************************************/ |
|
|
|
@ -366,9 +361,7 @@ void board_init_f(ulong bootflag) |
|
|
|
|
udelay(20); |
|
|
|
|
|
|
|
|
|
/* Initialize from environment */ |
|
|
|
|
if ((s = getenv("loadaddr")) != NULL) { |
|
|
|
|
load_addr = simple_strtoul(s, NULL, 16); |
|
|
|
|
} |
|
|
|
|
load_addr = getenv_ulong("loadaddr", 16, load_addr); |
|
|
|
|
#if defined(CONFIG_CMD_NET) |
|
|
|
|
if ((s = getenv("bootfile")) != NULL) { |
|
|
|
|
copy_filename(BootFile, s, sizeof(BootFile)); |
|
|
|
|