diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-29 09:37:40 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:39:10 +0100 |
| commit | 8e119b03c53d6fae93e045a7884d306f7f4348aa (patch) | |
| tree | 6a42f00aed255de97685e7b221a8a22a7b1c2622 | |
| parent | 675b46bbac183b33a69c55b2c0dcc76ff02f4567 (diff) | |
| download | u-boot-imx-8e119b03c53d6fae93e045a7884d306f7f4348aa.zip u-boot-imx-8e119b03c53d6fae93e045a7884d306f7f4348aa.tar.gz u-boot-imx-8e119b03c53d6fae93e045a7884d306f7f4348aa.tar.bz2 | |
board/jse/flash.c: fix GCC 4.6 build warnings
Fix:
flash.c: In function 'flash_erase':
flash.c:304:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]
In addition, remove some dead code.
Signed-off-by: Wolfgang Denk <wd@denx.de>
| -rw-r--r-- | board/jse/flash.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/board/jse/flash.c b/board/jse/flash.c index 5735f19..27cd469 100644 --- a/board/jse/flash.c +++ b/board/jse/flash.c @@ -301,7 +301,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) { volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *) (info->start[0]); volatile FLASH_WORD_SIZE *addr2; - int flag, prot, sect, l_sect; + int flag, prot, sect; int i; if ((s_first < 0) || (s_first > s_last)) { @@ -331,8 +331,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) printf ("\n"); } - l_sect = -1; - /* Disable interrupts which might cause a timeout here */ flag = disable_interrupts (); @@ -360,7 +358,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) addr[ADDR1] = (FLASH_WORD_SIZE) 0x00550055; addr2[0] = (FLASH_WORD_SIZE) 0x00300030; /* sector erase */ } - l_sect = sect; /* * Wait for each sector to complete, it's more * reliable. According to AMD Spec, you must @@ -379,16 +376,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) /* wait at least 80us - let's wait 1 ms */ udelay (1000); -#if 0 - /* - * We wait for the last triggered sector - */ - if (l_sect < 0) - goto DONE; - wait_for_DQ7 (info, l_sect); - -DONE: -#endif /* reset to read mode */ addr = (FLASH_WORD_SIZE *) info->start[0]; addr[0] = (FLASH_WORD_SIZE) 0x00F000F0; /* reset bank */ |