Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[oweals/u-boot.git] / board / eltec / mhpc / mhpc.c

diff --git a/board/eltec/mhpc/mhpc.c b/board/eltec/mhpc/mhpc.c
index bc3d9f4c6289f3dc9f5051033592cc54aee68f2d..3666791e986d439ec2686c06c3c4c5dc1547fc17 100644 (file)
--- a/board/eltec/mhpc/mhpc.c
+++ b/board/eltec/mhpc/mhpc.c
@@ -160,7 +160,7 @@ int misc_init_r (void)
        int i;
 
        /* check revision data */
-       eeprom_read (CFG_I2C_EEPROM_ADDR, 480, (char *) &mhpcRevInfo, 32);
+       eeprom_read (CFG_I2C_EEPROM_ADDR, 480, (uchar *) &mhpcRevInfo, 32);
 
        if (strncmp ((char *) &mhpcRevInfo.board[2], "MHPC", 4) != 0) {
                printf ("Enter revision number (0-9): %c  ",
@@ -228,7 +228,7 @@ int misc_init_r (void)
                }
 
                /* setup new revision data */
-               eeprom_write (CFG_I2C_EEPROM_ADDR, 480, (char *) &mhpcRevInfo,
+               eeprom_write (CFG_I2C_EEPROM_ADDR, 480, (uchar *) &mhpcRevInfo,
                              32);
        }
 
@@ -251,7 +251,7 @@ int misc_init_r (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        volatile immap_t *immap = (immap_t *) CFG_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
@@ -422,8 +422,8 @@ void *video_hw_init (void)
        immap_t *immr = (immap_t *) CFG_IMMR;
 
        /* enable video only on CLUT value */
-       if ((penv = getenv ("clut")) != NULL)
-               clut = (u_int) simple_strtoul (penv, NULL, 10);
+       if ((penv = (uchar *)getenv ("clut")) != NULL)
+               clut = (u_int) simple_strtoul ((char *)penv, NULL, 10);
        else
                return NULL;