diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
commit | 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch) | |
tree | e9563b2f28ea59062b90bb5712f141e8e9798aee /board/rbc823 | |
parent | 17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff) | |
download | u-boot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.gz u-boot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.bz2 u-boot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.zip |
Cleanup for GCC-4.x
Diffstat (limited to 'board/rbc823')
-rw-r--r-- | board/rbc823/flash.c | 5 | ||||
-rw-r--r-- | board/rbc823/rbc823.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/board/rbc823/flash.c b/board/rbc823/flash.c index f12d0be552..84ae5c1b5d 100644 --- a/board/rbc823/flash.c +++ b/board/rbc823/flash.c @@ -188,12 +188,11 @@ static ulong flash_get_size (vu_long *addr, flash_info_t *info) #endif switch (value) { - case 0x01: - case AMD_MANUFACT: + case 0x01: /*AMD_MANUFACT*/ info->flash_id = FLASH_MAN_AMD; break; - case FUJ_MANUFACT: + case 0x04: /*FUJ_MANUFACT*/ info->flash_id = FLASH_MAN_FUJ; break; diff --git a/board/rbc823/rbc823.c b/board/rbc823/rbc823.c index d0ceb4a7d5..9e60c2b646 100644 --- a/board/rbc823/rbc823.c +++ b/board/rbc823/rbc823.c @@ -127,7 +127,7 @@ const uint static_table[] = int checkboard (void) { - unsigned char *s = getenv ("serial#"); + char *s = getenv ("serial#"); if (!s || strncmp (s, "TQM8", 4)) { printf ("### No HW ID - assuming RBC823\n"); @@ -193,14 +193,14 @@ long int initdram (int board_type) * * try 8 column mode */ - size8 = dram_size (CFG_MAMR_8COL, (ulong *) SDRAM_BASE4_PRELIM, + size8 = dram_size (CFG_MAMR_8COL, (long *) SDRAM_BASE4_PRELIM, SDRAM_MAX_SIZE); udelay (1000); /* * try 9 column mode */ - size9 = dram_size (CFG_MAMR_9COL, (ulong *) SDRAM_BASE4_PRELIM, + size9 = dram_size (CFG_MAMR_9COL, (long *) SDRAM_BASE4_PRELIM, SDRAM_MAX_SIZE); if (size8 < size9) { /* leave configuration at 9 columns */ |