Merge with /home/m8/git/u-boot

[u-boot] / board / kup / kup4k / kup4k.c

diff --git a/board/kup/kup4k/kup4k.c b/board/kup/kup4k/kup4k.c
index c352c8b67172aca871cfdba13af60ea5f464ec81..e621c436ffd25837d4cd8332a7ea5c597cd13d22 100644 (file)
--- 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 */