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

board/ti/omap1610inn/flash.c: Fix GCC 4.6 build warnings

Browse Source 
Fix:
flash.c: In function 'flash_get_offsets':
flash.c:139:10: warning: variable 'pOrgDef' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'flash_erase':
flash.c:280:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:456:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Tom Rini <trini@ti.com>
This commit is contained in:
Wolfgang Denk 2011-12-09 12:14:29 +01:00
parent 85e04b7af7
commit 2ccf26da5e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
board/ti/omap1610inn/flash.c
View File

@ -136,9 +136,7 @@ void flash_unlock(flash_info_t * info)
static void flash_get_offsets (ulong base, flash_info_t * info)
{
int i;
OrgDef *pOrgDef;
pOrgDef = OrgIntel_28F256L18T;
if (info->flash_id == FLASH_UNKNOWN) {
return;
}
@ -352,6 +350,9 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
printf (" done\n");
}
}
if (flag)
enable_interrupts();
return rcode;
}
@ -453,13 +454,13 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
{
FPWV *addr = (FPWV *) dest;
ulong status;
int flag;
int flag, rc = 0;
ulong start;
/* Check if Flash is (sufficiently) erased */
if ((*addr & data) != data) {
printf ("not erased at %08lx (%x)\n", (ulong) addr, *addr);
return (2);
printf("not erased at %08lx (%x)\n", (ulong) addr, *addr);
return 2;
}
/* Disable interrupts which might cause a timeout here */
flag = disable_interrupts ();
@ -472,12 +473,16 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
/* wait while polling the status register */
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
*addr = (FPW) 0x00FF00FF; /* restore read mode */
return (1);
rc = 1;
goto done;
}
}
done:
if (flag)
enable_interrupts();
*addr = (FPW) 0x00FF00FF; /* restore read mode */
return (0);
return rc;
}
void inline spin_wheel (void)