diff options
author | Wolfgang Denk <wd@denx.de> | 2011-11-04 15:55:05 +0000 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-11-07 22:09:23 +0100 |
commit | ee6ed89c5b144f621969a2ef7188b52ec0c2ac9b (patch) | |
tree | e6c23b4a6c800968125866b0e777b8ce09b403ab | |
parent | b6a467d73d8847e2307e7e95768e3287d51a9fe6 (diff) | |
download | u-boot-imx-ee6ed89c5b144f621969a2ef7188b52ec0c2ac9b.zip u-boot-imx-ee6ed89c5b144f621969a2ef7188b52ec0c2ac9b.tar.gz u-boot-imx-ee6ed89c5b144f621969a2ef7188b52ec0c2ac9b.tar.bz2 |
board/mpl/common/flash.c: fix GCC 4.6 build warning
Fix:
../common/flash.c: In function 'flash_erase':
../common/flash.c:603:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Denis Peter <d.peter@mpl.ch>
-rw-r--r-- | board/mpl/common/flash.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index 61f031a..81d7271 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -600,7 +600,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, rcode = 0; @@ -632,8 +632,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(); @@ -672,7 +670,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) rcode |= wait_for_DQ7(info, sect); } } - l_sect = sect; /* * Wait for each sector to complete, it's more * reliable. According to AMD Spec, you must @@ -691,16 +688,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 */ |