Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[karo-tx-uboot.git] / board / canmb / canmb.c

diff --git a/board/canmb/canmb.c b/board/canmb/canmb.c
index e84ec5aa937a710c406ee68953d93ef73396952c..d3711d0779948d8adee35e65b352122ece041e4f 100644 (file)
--- a/board/canmb/canmb.c
+++ b/board/canmb/canmb.c
@@ -82,7 +82,7 @@ static void sdram_start (int hi_addr)
  */
 
 #if defined(CONFIG_MPC5200)
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        ulong dramsize = 0;
        ulong dramsize2 = 0;
@@ -133,7 +133,7 @@ long int initdram (int board_type)
        *(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize + 0x0000001e;/* 2G */
 
        /* find RAM size using SDRAM CS1 only */
-       if (!dramsize) 
+       if (!dramsize)
                sdram_start(0);
        test2 = test1 = get_ram_size((ulong *)(CFG_SDRAM_BASE + dramsize), 0x80000000);
        if (!dramsize) {
@@ -185,7 +185,7 @@ long int initdram (int board_type)
 
 #elif defined(CONFIG_MGT5100)
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        ulong dramsize = 0;
 #ifndef CFG_RAMBOOT