Cleanup for GCC-4.x

[oweals/u-boot.git] / board / LEOX / elpt860 / elpt860.c

diff --git a/board/LEOX/elpt860/elpt860.c b/board/LEOX/elpt860/elpt860.c
index 82a831f5245b296f47be7c68e2a3988cdd87e82e..775db738e6c3a7680900fd4096c302fa474a91ea 100644 (file)
--- a/board/LEOX/elpt860/elpt860.c
+++ b/board/LEOX/elpt860/elpt860.c
@@ -169,7 +169,7 @@ int board_early_init_f (void)
 
 int checkboard (void)
 {
-       unsigned char *s = getenv ("serial#");
+       char *s = getenv ("serial#");
 
        if (!s || strncmp (s, "ELPT860", 7))
                printf ("### No HW ID - assuming ELPT860\n");
@@ -253,7 +253,7 @@ long int initdram (int board_type)
         * try 8 column mode
         */
        size8 = dram_size (CFG_MAMR_8COL,
-                          (ulong *) SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
+                          SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
 
        udelay (1000);
 
@@ -261,7 +261,7 @@ long int initdram (int board_type)
         * try 9 column mode
         */
        size9 = dram_size (CFG_MAMR_9COL,
-                          (ulong *) SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
+                          SDRAM_BASE1_PRELIM, SDRAM_MAX_SIZE);
 
        if (size8 < size9) {    /* leave configuration at 9 columns       */
                size_b0 = size9;