V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

board/alaska/flash.c: Fix GCC 4.6 build warnings 

Fix:
flash.c: In function 'flash_erase':
flash.c:409:21: warning: variable 'last' set but not used
[-Wunused-but-set-variable]
flash.c:408:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:669:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'write_data_block':
flash.c:709:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:56:00 +00:00
parent 8a33201d0c
commit 23bda7d43f
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
board/alaska/flash.c
View File

@ -406,7 +406,7 @@ static unsigned char same_chip_banks (int bank1, int bank2)
int flash_erase (flash_info_t * info, int s_first, int s_last) int flash_erase (flash_info_t * info, int s_first, int s_last)
{ {
int flag, prot, sect; int flag, prot, sect;
ulong type, start, last; ulong type, start;
int rcode = 0, intel = 0; int rcode = 0, intel = 0;
if ((s_first < 0) || (s_first > s_last)) { if ((s_first < 0) || (s_first > s_last)) {
@ -444,7 +444,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
} }
start = get_timer (0); start = get_timer (0);
last = start;
/* Disable interrupts which might cause a timeout here */ /* Disable interrupts which might cause a timeout here */
flag = disable_interrupts (); flag = disable_interrupts ();
@ -501,6 +500,9 @@ 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;
} }
@ -666,7 +668,7 @@ static int write_data (flash_info_t * info, ulong dest, FPW data)
{ {
FPWV *addr = (FPWV *) dest; FPWV *addr = (FPWV *) dest;
ulong start; ulong start;
int flag; int flag, rc = 0;
/* Check if Flash is (sufficiently) erased */ /* Check if Flash is (sufficiently) erased */
if ((*addr & data) != data) { if ((*addr & data) != data) {
@ -685,14 +687,18 @@ 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 ((*addr & (FPW) 0x00800080) != (FPW) 0x00800080) { while ((*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 OUT;
} }
} }
*addr = (FPW) 0x00FF00FF; /* restore read mode */ OUT:
*addr = (FPW)0x00FF00FF; /* restore read mode */
return (0); if (flag)
enable_interrupts();
return rc;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
@ -706,7 +712,7 @@ static int write_data_block (flash_info_t * info, ulong src, ulong dest)
FPWV *srcaddr = (FPWV *) src; FPWV *srcaddr = (FPWV *) src;
FPWV *dstaddr = (FPWV *) dest; FPWV *dstaddr = (FPWV *) dest;
ulong start; ulong start;
int flag, i; int flag, i, rc = 0;
/* Check if Flash is (sufficiently) erased */ /* Check if Flash is (sufficiently) erased */
for (i = 0; i < WR_BLOCK; i++) for (i = 0; i < WR_BLOCK; i++)
@ -727,10 +733,10 @@ static int write_data_block (flash_info_t * info, ulong src, ulong dest)
start = get_timer (0); start = get_timer (0);
/* wait while polling the status register */ /* wait while polling the status register */
while ((*dstaddr & (FPW) 0x00800080) != (FPW) 0x00800080) { while ((*dstaddr & (FPW)0x00800080) != (FPW)0x00800080) {
if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) { if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
*dstaddr = (FPW) 0x00FF00FF; /* restore read mode */ rc = 1;
return (1); goto OUT;
} }
} }
@ -752,9 +758,12 @@ static int write_data_block (flash_info_t * info, ulong src, ulong dest)
} }
} }
*dstaddr = (FPW) 0x00FF00FF; /* restore read mode */ OUT:
*dstaddr = (FPW)0x00FF00FF; /* restore read mode */
if (flag)
enable_interrupts();
return (0); return rc;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------