From 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 13 Oct 2005 16:45:02 +0200 Subject: Cleanup for GCC-4.x --- board/Marvell/common/flash.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'board/Marvell/common/flash.c') diff --git a/board/Marvell/common/flash.c b/board/Marvell/common/flash.c index c2c5b76594..a8add85672 100644 --- a/board/Marvell/common/flash.c +++ b/board/Marvell/common/flash.c @@ -526,7 +526,7 @@ flash_get_size (int portwidth, vu_long * addr, flash_info_t * info) int flash_erase (flash_info_t * info, int s_first, int s_last) { - volatile unsigned char *addr = (char *) (info->start[0]); + volatile unsigned char *addr = (uchar *) (info->start[0]); int flag, prot, sect, l_sect; ulong start, now, last; @@ -696,7 +696,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) for (sect = s_first; sect <= s_last; sect++) { int sector_size = info->size / info->sector_count; - addr = (char *) (info->start[sect]); + addr = (uchar *) (info->start[sect]); memset ((void *) addr, 0, sector_size); } return 0; @@ -752,7 +752,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) /* Start erase on unprotected sectors */ for (sect = s_first; sect <= s_last; sect++) { if (info->protect[sect] == 0) { /* not protected */ - addr = (char *) (info->start[sect]); + addr = (uchar *) (info->start[sect]); flash_cmd (info->portwidth, addr, 0, 0x30); l_sect = sect; } @@ -893,7 +893,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) /* broken for 2x16: TODO */ static int write_word (flash_info_t * info, ulong dest, ulong data) { - volatile unsigned char *addr = (char *) (info->start[0]); + volatile unsigned char *addr = (uchar *) (info->start[0]); ulong start; int flag, i; ulong mask; @@ -926,7 +926,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data) CHIP_CMD_RST); /* 1st cycle of word/byte program */ /* write 0x40 to the location to program */ - flash_cmd (info->portwidth, (char *) dest, 0, + flash_cmd (info->portwidth, (uchar *) dest, 0, CHIP_CMD_PROG); /* 2nd cycle of word/byte program */ /* write the data to the destination address */ -- cgit v1.2.1