|
@@ -50,13 +50,7 @@ ulong monitor_flash_len;
|
|
#endif
|
|
#endif
|
|
static int init_baudrate(void)
|
|
static int init_baudrate(void)
|
|
{
|
|
{
|
|
- char tmp[64]; /* long enough for environment variables */
|
|
|
|
- int i = getenv_f("baudrate", tmp, sizeof(tmp));
|
|
|
|
-
|
|
|
|
- gd->bd->bi_baudrate = gd->baudrate = (i > 0)
|
|
|
|
- ? (int) simple_strtoul(tmp, NULL, 10)
|
|
|
|
- : CONFIG_BAUDRATE;
|
|
|
|
-
|
|
|
|
|
|
+ gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -400,9 +394,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
/* Initialize from environment */
|
|
/* Initialize from environment */
|
|
- s = getenv("loadaddr");
|
|
|
|
- if (s != NULL)
|
|
|
|
- load_addr = simple_strtoul(s, NULL, 16);
|
|
|
|
|
|
+ load_addr = getenv_ulong("loadaddr", 16, load_addr);
|
|
|
|
|
|
#if defined(CONFIG_CMD_NET)
|
|
#if defined(CONFIG_CMD_NET)
|
|
s = getenv("bootfile");
|
|
s = getenv("bootfile");
|