summaryrefslogtreecommitdiff
path: root/board/xaeniax/flash.c
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2011-11-19 10:17:04 +0000
committerHeiko Schocher <hs@denx.de>2011-11-23 08:32:16 +0100
commitbf1d6440a241838fbcef2e07394e435f9e4ae181 (patch)
tree9258faf834d3dd21188ad53d6d343f70572f77d2 /board/xaeniax/flash.c
parentc0fe04bf6559c5cb504f107d81f6a80b9416e986 (diff)
downloadu-boot-imx-bf1d6440a241838fbcef2e07394e435f9e4ae181.zip
u-boot-imx-bf1d6440a241838fbcef2e07394e435f9e4ae181.tar.gz
u-boot-imx-bf1d6440a241838fbcef2e07394e435f9e4ae181.tar.bz2
board/xaeniax/flash.c: Fix GCC 4.6 warnings
Fix: flash.c: In function 'flash_erase': flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] flash.c: In function 'write_data': flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'board/xaeniax/flash.c')
-rw-r--r--board/xaeniax/flash.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/board/xaeniax/flash.c b/board/xaeniax/flash.c
index 6cb0aca..836c87e 100644
--- a/board/xaeniax/flash.c
+++ b/board/xaeniax/flash.c
@@ -220,7 +220,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
int flash_erase (flash_info_t *info, int s_first, int s_last)
{
- int flag, prot, sect;
+ int prot, sect;
ulong type, start;
int rcode = 0;
@@ -255,7 +255,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
}
/* Disable interrupts which might cause a timeout here */
- flag = disable_interrupts ();
+ disable_interrupts();
/* Start erase on unprotected sectors */
for (sect = s_first; sect <= s_last; sect++) {
@@ -389,7 +389,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
{
FPWV *addr = (FPWV *) dest;
ulong status;
- int flag;
ulong start;
/* Check if Flash is (sufficiently) erased */
@@ -398,7 +397,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
return (2);
}
/* Disable interrupts which might cause a timeout here */
- flag = disable_interrupts ();
+ disable_interrupts();
*addr = (FPW) 0x00400040; /* write setup */
*addr = data;