board/rbc823/flash.c: Fix flash initalization

The RBC823 has only one NOR flash bank.  Remove all code trying to
deal with a second bank.  This also fixes a number of GCC 4.6 build
warnings:
flash.c: In function 'flash_init':
flash.c:62:12: warning: array subscript is above array bounds
[-Warray-bounds]
flash.c:63:12: warning: array subscript is above array bounds
[-Warray-bounds]
flash.c:66:12: warning: array subscript is above array bounds
[-Warray-bounds]

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:55:47 +00:00
parent 6915840ffb
commit e0ead84895
1 changed files with 3 additions and 9 deletions

View File

@ -35,7 +35,7 @@ static void flash_get_offsets(ulong base, flash_info_t *info);
unsigned long flash_init(void)
{
unsigned long size_b0, size_b1;
unsigned long size_b0;
int i;
/* Init: no FLASHes known */
@ -57,15 +57,9 @@ unsigned long flash_init(void)
&flash_info[0]);
#endif
size_b1 = 0 ;
flash_info[1].flash_id = FLASH_UNKNOWN;
flash_info[1].sector_count = -1;
flash_info[0].size = size_b0;
flash_info[1].size = size_b1;
return size_b0 + size_b1;
return size_b0;
}
/*-----------------------------------------------------------------------
@ -181,7 +175,7 @@ static ulong flash_get_size(vu_long *addr, flash_info_t *info)
/* Write auto select command: read Manufacturer ID */
debug("Base address is: %08x\n", caddr);
debug("Base address is: %8p\n", caddr);
caddr[0x0555] = 0xAA;
caddr[0x02AA] = 0x55;