mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-10 04:26:19 -04:00
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>
This commit is contained in:
parent
b6a467d73d
commit
ee6ed89c5b
@ -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 *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, rcode = 0;
|
int i, rcode = 0;
|
||||||
|
|
||||||
|
|
||||||
@ -632,8 +632,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();
|
||||||
|
|
||||||
@ -672,7 +670,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
|
|||||||
rcode |= wait_for_DQ7(info, sect);
|
rcode |= wait_for_DQ7(info, sect);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
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
|
||||||
@ -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 */
|
/* 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 */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user