Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master

[oweals/u-boot.git] / board / esd / dasa_sim / dasa_sim.c

diff --git a/board/esd/dasa_sim/dasa_sim.c b/board/esd/dasa_sim/dasa_sim.c
index 57a971f433c2da3ae7fd5322155e58a506efa0fc..fb0c77e56649d40cad288687aa25dc8d55da098b 100644 (file)
--- a/board/esd/dasa_sim/dasa_sim.c
+++ b/board/esd/dasa_sim/dasa_sim.c
@@ -162,7 +162,7 @@ int checkboard (void)
 {
        int index;
        int len;
-       unsigned char str[64];
+       char str[64];
        int i = getenv_r ("serial#", str, sizeof (str));
        int fpga;
        unsigned short val;
@@ -206,7 +206,7 @@ int checkboard (void)
 
 /* ------------------------------------------------------------------------- */
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return (16 * 1024 * 1024);
 }