diff options
| author | Anatolij Gustschin <agust@denx.de> | 2011-11-15 13:20:56 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-16 21:32:13 +0100 |
| commit | 49adbe8109b56b837fb99b7945ab465f6b24acf5 (patch) | |
| tree | 46d8f3d63b643834a6e8eb707aa4d88c85572db7 /board/cm41xx/flash.c | |
| parent | da5406655ae4762c36a221b6b0ac6f1c334ae660 (diff) | |
| download | olio-uboot-2014.01-49adbe8109b56b837fb99b7945ab465f6b24acf5.tar.xz olio-uboot-2014.01-49adbe8109b56b837fb99b7945ab465f6b24acf5.zip | |
board/cm41xx/flash.c: Fix GCC 4.6 warnings
Fix:
flash.c: In function 'flash_erase':
flash.c:209:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:373:6: warning: variable 'flag' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'board/cm41xx/flash.c')
| -rw-r--r-- | board/cm41xx/flash.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/board/cm41xx/flash.c b/board/cm41xx/flash.c index 2e1356f9f..5522bf085 100644 --- a/board/cm41xx/flash.c +++ b/board/cm41xx/flash.c @@ -206,7 +206,7 @@ static ulong flash_get_size (unsigned char * 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; int rcode = 0; ulong start; @@ -240,7 +240,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) printf ("\n"); /* 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++) { @@ -370,7 +370,6 @@ static int write_data (flash_info_t * info, ulong dest, unsigned char data) { volatile unsigned char *addr = (volatile unsigned char *) dest; ulong status; - int flag; ulong start; /* Check if Flash is (sufficiently) erased */ @@ -380,7 +379,7 @@ static int write_data (flash_info_t * info, ulong dest, unsigned char data) return (2); } /* Disable interrupts which might cause a timeout here */ - flag = disable_interrupts (); + disable_interrupts(); *addr = 0x40; /* write setup */ *addr = data; |