leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board/cray/L1/flash.c: Fix GCC 4.6 build warning

Browse Source 
Fix:
flash.c: In function 'flash_erase':
flash.c:276:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
Wolfgang Denk 2011-11-29 22:17:47 +00:00
parent 24ec52dec2
commit fc4df325dc
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
board/cray/L1/flash.c
View File

@ -273,7 +273,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;
if ((s_first < 0) || (s_first > s_last)) { if ((s_first < 0) || (s_first > s_last)) {
if (info->flash_id == FLASH_UNKNOWN) { if (info->flash_id == FLASH_UNKNOWN) {
@ -303,16 +303,14 @@ 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();
/* Start erase on unprotected sectors */ /* Start erase on unprotected sectors */
for (sect = s_first; sect<=s_last; sect++) { for (sect = s_first; sect<=s_last; sect++) {
if (info->protect[sect] == 0) { /* not protected */ if (info->protect[sect] == 0) { /* not protected */
addr2 = (FLASH_WORD_SIZE *)(info->start[sect]); addr2 = (FLASH_WORD_SIZE *)(info->start[sect]);
printf("Erasing sector %p\n", addr2); printf("Erasing sector %p\n", addr2);
addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA; addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055; addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
@ -320,15 +318,14 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA; addr[ADDR0] = (FLASH_WORD_SIZE)0x00AA00AA;
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 * issue all erase commands within a specified
* issue all erase commands within a specified * timeout. This has been seen to fail, especially
* timeout. This has been seen to fail, especially * if printf()s are included (for debug)!!
* if printf()s are included (for debug)!! */
*/ wait_for_DQ7(info, sect);
wait_for_DQ7(info, sect);
} }
} }