diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 16:45:02 +0200 |
| commit | 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch) | |
| tree | e9563b2f28ea59062b90bb5712f141e8e9798aee /board/kup | |
| parent | 17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff) | |
Cleanup for GCC-4.x
Diffstat (limited to 'board/kup')
| -rw-r--r-- | board/kup/common/load_sernum_ethaddr.c | 12 | ||||
| -rw-r--r-- | board/kup/kup4k/kup4k.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/kup/common/load_sernum_ethaddr.c b/board/kup/common/load_sernum_ethaddr.c index 39ee124eb..b7b749985 100644 --- a/board/kup/common/load_sernum_ethaddr.c +++ b/board/kup/common/load_sernum_ethaddr.c @@ -54,9 +54,9 @@ void load_sernum_ethaddr (void) { unsigned char *hwi; - unsigned char *var; + char *var; unsigned char hwi_stack[CFG_HWINFO_SIZE]; - unsigned char *p; + char *p; hwi = (unsigned char *) (CFG_FLASH_BASE + CFG_HWINFO_OFFSET); if (*((unsigned long *) hwi) != (unsigned long) CFG_HWINFO_MAGIC) { @@ -68,11 +68,11 @@ void load_sernum_ethaddr (void) /* ** ethaddr */ - var = strstr (hwi_stack, ETHADDR_TOKEN); + var = strstr ((char *)hwi_stack, ETHADDR_TOKEN); if (var) { var += sizeof (ETHADDR_TOKEN) - 1; p = strchr (var, '\r'); - if (p < hwi + CFG_HWINFO_SIZE) { + if ((unsigned char *)p < hwi + CFG_HWINFO_SIZE) { *p = '\0'; setenv ("ethaddr", var); *p = '\r'; @@ -81,11 +81,11 @@ void load_sernum_ethaddr (void) /* ** lcd */ - var = strstr (hwi_stack, LCD_TOKEN); + var = strstr ((char *)hwi_stack, LCD_TOKEN); if (var) { var += sizeof (LCD_TOKEN) - 1; p = strchr (var, '\r'); - if (p < hwi + CFG_HWINFO_SIZE) { + if ((unsigned char *)p < hwi + CFG_HWINFO_SIZE) { *p = '\0'; setenv ("lcd", var); *p = '\r'; diff --git a/board/kup/kup4k/kup4k.c b/board/kup/kup4k/kup4k.c index c352c8b67..e621c436f 100644 --- a/board/kup/kup4k/kup4k.c +++ b/board/kup/kup4k/kup4k.c @@ -327,7 +327,7 @@ void lcd_logo (bd_t * bd) int r = 8, g = 8, b = 4; int r1, g1, b1; int n; - uchar tmp[64]; /* long enough for environment variables */ + char tmp[64]; /* long enough for environment variables */ int tft = 0; immr->im_cpm.cp_pbpar &= ~(PB_LCD_PWM); @@ -453,7 +453,7 @@ void lcd_logo (bd_t * bd) } /* copy bitmap */ - fb = (char *) (fb_info.VmemAddr); + fb = (uchar *) (fb_info.VmemAddr); memcpy (fb, (uchar *) CONFIG_KUP4K_LOGO, 320 * 240); } #endif /* CONFIG_KUP4K_LOGO */ |