diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-11 22:53:33 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-11 22:53:33 +0100 |
| commit | d52fb7e3d135704334bd6f97f3444e824665b76f (patch) | |
| tree | e1e91e323b603533acda1c1de53388c588e3753c /lib_arm/board.c | |
| parent | 4367a01036bdb67e7fc3000cedba7195fbdee304 (diff) | |
Some code cleanup for GCC 4.x
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index c73cf0c38fb..76639081ed2 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -121,7 +121,7 @@ void *sbrk (ptrdiff_t increment) static int init_baudrate (void) { - uchar tmp[64]; /* long enough for environment variables */ + char tmp[64]; /* long enough for environment variables */ int i = getenv_r ("baudrate", tmp, sizeof (tmp)); gd->bd->bi_baudrate = gd->baudrate = (i > 0) ? (int) simple_strtoul (tmp, NULL, 10) @@ -235,9 +235,11 @@ init_fnc_t *init_sequence[] = { void start_armboot (void) { - ulong size; init_fnc_t **init_fnc_ptr; char *s; +#ifndef CFG_NO_FLASH + ulong size; +#endif #if defined(CONFIG_VFD) || defined(CONFIG_LCD) unsigned long addr; #endif @@ -320,7 +322,7 @@ void start_armboot (void) int i; ulong reg; char *s, *e; - uchar tmp[64]; + char tmp[64]; i = getenv_r ("ethaddr", tmp, sizeof (tmp)); s = (i > 0) ? tmp : NULL; |