Merge commit 'wd/master'

[karo-tx-uboot.git] / common / cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 0d67132363cffd3b4f3345d92da55149e36fb283..f701ab6f7c6af48efb16997aecd2e3b8ef1812bb 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -127,7 +127,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong           os_data, os_len;
        ulong           image_start, image_end;
        ulong           load_start, load_end;
-       ulong           mem_start, mem_size;
+       ulong           mem_start;
+       phys_size_t     mem_size;
 
        struct lmb lmb;
 
@@ -141,7 +142,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        mem_start = getenv_bootm_low();
        mem_size = getenv_bootm_size();
 
-       lmb_add(&lmb, mem_start, mem_size);
+       lmb_add(&lmb, (phys_addr_t)mem_start, mem_size);
 
        board_lmb_reserve(&lmb);
 
@@ -612,7 +613,7 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
                return NULL;
        }
 
-       debug ("   kernel data at 0x%08lx, len = 0x%08lx (%d)\n",
+       debug ("   kernel data at 0x%08lx, len = 0x%08lx (%ld)\n",
                        *os_data, *os_len, *os_len);
 
        return (void *)img_addr;