sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Wolfgang Denk 2011-10-29 09:37:40 +00:00
parent 675b46bbac
commit 8e119b03c5
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
board/jse/flash.c
View File

@ -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 *addr = (FLASH_WORD_SIZE *) (info->start[0]);
volatile FLASH_WORD_SIZE *addr2; volatile FLASH_WORD_SIZE *addr2;
int flag, prot, sect, l_sect; int flag, prot, sect;
int i; int i;
if ((s_first < 0) || (s_first > s_last)) { 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"); printf ("\n");
} }
l_sect = -1;
/* Disable interrupts which might cause a timeout here */ /* Disable interrupts which might cause a timeout here */
flag = disable_interrupts (); 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; addr[ADDR1] = (FLASH_WORD_SIZE) 0x00550055;
addr2[0] = (FLASH_WORD_SIZE) 0x00300030; /* sector erase */ addr2[0] = (FLASH_WORD_SIZE) 0x00300030; /* sector erase */
} }
l_sect = sect;
/* /*
* Wait for each sector to complete, it's more * Wait for each sector to complete, it's more
* reliable. According to AMD Spec, you must * 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 */ /* wait at least 80us - let's wait 1 ms */
udelay (1000); 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 */ /* reset to read mode */
addr = (FLASH_WORD_SIZE *) info->start[0]; addr = (FLASH_WORD_SIZE *) info->start[0];
addr[0] = (FLASH_WORD_SIZE) 0x00F000F0; /* reset bank */ addr[0] = (FLASH_WORD_SIZE) 0x00F000F0; /* reset bank */