diff options
| author | Simon Glass | 2011-10-13 14:43:09 +0000 |
|---|---|---|
| committer | Wolfgang Denk | 2011-10-23 23:33:18 +0200 |
| commit | 77b8f2033baf35bbf8803e76227c7242f92a826b (patch) | |
| tree | f9a1a0eadd059f2afe0dcc57a4a80bea05d2c9a4 /arch | |
| parent | c1f485a1e8fc6ca14aceb1c5ddf94c1638d40909 (diff) | |
m68k: Use getenv_ulong() in place of getenv(), strtoul
This changes the board code to use the new getenv_ulong() function.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/lib/board.c | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c index b9ccb640599..259b71c3b26 100644 --- a/arch/m68k/lib/board.c +++ b/arch/m68k/lib/board.c @@ -119,13 +119,8 @@ typedef int (init_fnc_t) (void); 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; } /***********************************************************************/ @@ -221,9 +216,7 @@ board_init_f (ulong bootflag) gd_t *id; init_fnc_t **init_fnc_ptr; #ifdef CONFIG_PRAM - int i; ulong reg; - char tmp[64]; /* long enough for environment variables */ #endif /* Pointer is writable since we allocated a register for it */ @@ -264,8 +257,7 @@ board_init_f (ulong bootflag) /* * reserve protected RAM */ - i = getenv_f("pram", tmp, sizeof (tmp)); - reg = (i > 0) ? simple_strtoul (tmp, NULL, 10) : CONFIG_PRAM; + reg = getenv_ulong("pram", 10, CONFIG_PRAM); addr -= (reg << 10); /* size is in kB */ debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr); #endif /* CONFIG_PRAM */ @@ -575,9 +567,7 @@ void board_init_r (gd_t *id, ulong dest_addr) /* Insert function pointers now that we have relocated the code */ /* 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)); @@ -648,18 +638,11 @@ void board_init_r (gd_t *id, ulong dest_addr) * taking into account the protected RAM at top of memory */ { - ulong pram; - char memsz[32]; -#ifdef CONFIG_PRAM - char *s; + ulong pram = 0; + uchar memsz[32]; - if ((s = getenv ("pram")) != NULL) { - pram = simple_strtoul (s, NULL, 10); - } else { - pram = CONFIG_PRAM; - } -#else - pram=0; +#ifdef CONFIG_PRAM + pram = getenv_ulong("pram", 10, CONFIG_PRAM); #endif #ifdef CONFIG_LOGBUFFER /* Also take the logbuffer into account (pram is in kB) */ |