diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:22:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:22:28 +0200 |
| commit | cbf9c117282b8729bdb86071997b58fcab58c444 (patch) | |
| tree | ff9175f1d987c49ef8b3b334bffae4f35ca8b759 /board/amcc/yellowstone/flash.c | |
| parent | a99a0a98b9fcf78ee2ceda893e8d4bd9b11e427a (diff) | |
| parent | 2c61f14c60ccc5a1c90205991bf555872887a831 (diff) | |
| download | u-boot-cbf9c117282b8729bdb86071997b58fcab58c444.tar.gz | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/amcc/yellowstone/flash.c')
| -rw-r--r-- | board/amcc/yellowstone/flash.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/board/amcc/yellowstone/flash.c b/board/amcc/yellowstone/flash.c index 99fcfb5c7e..cd6a2e61e6 100644 --- a/board/amcc/yellowstone/flash.c +++ b/board/amcc/yellowstone/flash.c @@ -329,7 +329,6 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *) (info->start[0]); volatile FLASH_WORD_SIZE *addr2; int flag, prot, sect, l_sect; - int i; if ((s_first < 0) || (s_first > s_last)) { if (info->flash_id == FLASH_UNKNOWN) { @@ -517,7 +516,7 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) */ static int write_word(flash_info_t * info, ulong dest, ulong data) { - volatile vu_long *addr2 = (vu_long *) (info->start[0]); + vu_long *addr2 = (vu_long *) (info->start[0]); volatile FLASH_WORD_SIZE *dest2 = (FLASH_WORD_SIZE *) dest; volatile FLASH_WORD_SIZE *data2 = (FLASH_WORD_SIZE *) & data; ulong start; |