mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
board/ti/omap730p2/flash.c: Fix GCC 4.6 build warnings
Fix: flash.c: In function 'flash_get_offsets': flash.c:122:10: warning: variable 'pOrgDef' set but not used [-Wunused-but-set-variable] flash.c: In function 'flash_erase': flash.c:263:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] flash.c: In function 'write_data': flash.c:439:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Dave Peverley <dpeverley@mpc-data.co.uk> Acked-by: Tom Rini <trini@ti.com>
This commit is contained in:
parent
c81f9cdd22
commit
f23b7ea0e6
1 changed files with 12 additions and 7 deletions
|
@ -119,9 +119,7 @@ unsigned long flash_init (void)
|
||||||
static void flash_get_offsets (ulong base, flash_info_t * info)
|
static void flash_get_offsets (ulong base, flash_info_t * info)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
OrgDef *pOrgDef;
|
|
||||||
|
|
||||||
pOrgDef = OrgIntel_28F256L18T;
|
|
||||||
if (info->flash_id == FLASH_UNKNOWN) {
|
if (info->flash_id == FLASH_UNKNOWN) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -335,6 +333,10 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
|
||||||
printf (" done\n");
|
printf (" done\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (flag)
|
||||||
|
enable_interrupts();
|
||||||
|
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -436,7 +438,7 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
|
||||||
{
|
{
|
||||||
FPWV *addr = (FPWV *) dest;
|
FPWV *addr = (FPWV *) dest;
|
||||||
ulong status;
|
ulong status;
|
||||||
int flag;
|
int flag, rc = 0;
|
||||||
ulong start;
|
ulong start;
|
||||||
|
|
||||||
/* Check if Flash is (sufficiently) erased */
|
/* Check if Flash is (sufficiently) erased */
|
||||||
|
@ -456,12 +458,15 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
|
||||||
/* wait while polling the status register */
|
/* wait while polling the status register */
|
||||||
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
|
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
|
||||||
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
|
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
|
||||||
*addr = (FPW) 0x00FF00FF; /* restore read mode */
|
rc = 1;
|
||||||
return (1);
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*addr = (FPW) 0x00FF00FF; /* restore read mode */
|
done:
|
||||||
return (0);
|
*addr = (FPW)0x00FF00FF; /* restore read mode */
|
||||||
|
if (flag)
|
||||||
|
enable_interrupts();
|
||||||
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
void inline spin_wheel (void)
|
void inline spin_wheel (void)
|
||||||
|
|
Loading…
Add table
Reference in a new issue