LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: 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>
Acked-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Glass 2011-10-13 14:43:12 +00:00 committed by Wolfgang Denk
parent 98e4611f10
commit 1272592e4b
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/powerpc/lib/board.c
View File

@ -158,13 +158,8 @@ typedef int (init_fnc_t) (void);
static int init_baudrate (void) static int init_baudrate (void)
{ {
char tmp[64]; /* long enough for environment variables */ gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE);
int i = getenv_f("baudrate", tmp, sizeof (tmp)); return 0;
gd->baudrate = (i > 0)
? (int) simple_strtoul (tmp, NULL, 10)
: CONFIG_BAUDRATE;
return (0);
} }
/***********************************************************************/ /***********************************************************************/
@ -374,9 +369,7 @@ void board_init_f (ulong bootflag)
gd_t *id; gd_t *id;
init_fnc_t **init_fnc_ptr; init_fnc_t **init_fnc_ptr;
#ifdef CONFIG_PRAM #ifdef CONFIG_PRAM
int i;
ulong reg; ulong reg;
uchar tmp[64]; /* long enough for environment variables */
#endif #endif
/* Pointer is writable since we allocated a register for it */ /* Pointer is writable since we allocated a register for it */
@ -448,10 +441,9 @@ void board_init_f (ulong bootflag)
/* /*
* reserve protected RAM * reserve protected RAM
*/ */
i = getenv_f("pram", (char *)tmp, sizeof (tmp)); reg = getenv_ulong("pram", 10, CONFIG_PRAM);
reg = (i > 0) ? simple_strtoul ((const char *)tmp, NULL, 10) : CONFIG_PRAM;
addr -= (reg << 10); /* size is in kB */ addr -= (reg << 10); /* size is in kB */
debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr); debug("Reserving %ldk for protected RAM at %08lx\n", reg, addr);
#endif /* CONFIG_PRAM */ #endif /* CONFIG_PRAM */
/* round down to next 4 kB limit */ /* round down to next 4 kB limit */
@ -933,9 +925,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
udelay (20); udelay (20);
/* Initialize from environment */ /* Initialize from environment */
if ((s = getenv ("loadaddr")) != NULL) { load_addr = getenv_ulong("loadaddr", 16, load_addr);
load_addr = simple_strtoul (s, NULL, 16);
}
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) { if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile)); copy_filename (BootFile, s, sizeof (BootFile));
@ -1018,18 +1008,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
* taking into account the protected RAM at top of memory * taking into account the protected RAM at top of memory
*/ */
{ {
ulong pram; ulong pram = 0;
uchar memsz[32]; uchar memsz[32];
#ifdef CONFIG_PRAM
char *s;
if ((s = getenv ("pram")) != NULL) { #ifdef CONFIG_PRAM
pram = simple_strtoul (s, NULL, 10); pram = getenv_ulong("pram", 10, CONFIG_PRAM);
} else {
pram = CONFIG_PRAM;
}
#else
pram=0;
#endif #endif
#ifdef CONFIG_LOGBUFFER #ifdef CONFIG_LOGBUFFER
#ifndef CONFIG_ALT_LB_ADDR #ifndef CONFIG_ALT_LB_ADDR