GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 21:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board/genietv/flash.c: Fix flash initialization

Browse source 
The GENIETV 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:65:12: warning: array subscript is above array bounds
[-Warray-bounds]
flash.c:66:12: warning: array subscript is above array bounds
[-Warray-bounds]
flash.c:69:12: warning: array subscript is above array bounds
[-Warray-bounds]
flash.c:183:2: warning: format '%x' expects argument of type 'unsigned
int', but argument 2 has type '

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:55:41 +00:00
parent 098a8a83ea
commit 250b66e2ce
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
board/genietv/flash.c
View file

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2000 * (C) Copyright 2000-2011
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -38,7 +38,7 @@ static void flash_get_offsets(ulong base, flash_info_t *info);
unsigned long flash_init(void) unsigned long flash_init(void)
{ {
unsigned long size_b0, size_b1; unsigned long size_b0;
int i; int i;
/* Init: no FLASHes known */ /* Init: no FLASHes known */
@ -60,15 +60,9 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
#endif #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[0].size = size_b0;
flash_info[1].size = size_b1;
return size_b0 + size_b1; return size_b0;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -186,7 +180,7 @@ static ulong flash_get_size(vu_long *addr, flash_info_t *info)
/* Write auto select command: read Manufacturer ID */ /* 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[0x0555] = 0xAA;
caddr[0x02AA] = 0x55; caddr[0x02AA] = 0x55;