diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-11 22:53:33 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-11 22:53:33 +0100 |
| commit | d52fb7e3d135704334bd6f97f3444e824665b76f (patch) | |
| tree | e1e91e323b603533acda1c1de53388c588e3753c /board/at91rm9200dk | |
| parent | 4367a01036bdb67e7fc3000cedba7195fbdee304 (diff) | |
Some code cleanup for GCC 4.x
Diffstat (limited to 'board/at91rm9200dk')
| -rw-r--r-- | board/at91rm9200dk/at45.c | 2 | ||||
| -rw-r--r-- | board/at91rm9200dk/flash.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/board/at91rm9200dk/at45.c b/board/at91rm9200dk/at45.c index 3c00132164..f886fe4820 100644 --- a/board/at91rm9200dk/at45.c +++ b/board/at91rm9200dk/at45.c @@ -593,7 +593,7 @@ int AT91F_DataFlashRead( if (AT91F_DataFlashWaitReady(pDataFlash->pDataFlashDesc, AT91C_TIMEOUT_WRDY) != DATAFLASH_OK) return -1; - if (AT91F_DataFlashContinuousRead (pDataFlash, addr, buffer, SizeToRead) != DATAFLASH_OK) + if (AT91F_DataFlashContinuousRead (pDataFlash, addr, (uchar *)buffer, SizeToRead) != DATAFLASH_OK) return -1; size -= SizeToRead; diff --git a/board/at91rm9200dk/flash.c b/board/at91rm9200dk/flash.c index f6228ef03e..0513d61d73 100644 --- a/board/at91rm9200dk/flash.c +++ b/board/at91rm9200dk/flash.c @@ -393,8 +393,7 @@ outahere: * Copy memory to flash */ -volatile static int write_word (flash_info_t * info, ulong dest, - ulong data) +static int write_word (flash_info_t * info, ulong dest, ulong data) { volatile u16 *addr = (volatile u16 *) dest; ulong result; @@ -409,7 +408,6 @@ volatile static int write_word (flash_info_t * info, ulong dest, if ((result & data) != data) return ERR_NOT_ERASED; - /* * Disable interrupts which might cause a timeout * here. Remember that our exception vectors are |