Merge commit 'wd/master'

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

diff --git a/board/barco/barco.c b/board/barco/barco.c
index becbd0abda623cd85271acc8725cc80cc6d23f6f..f8b2084c454cf9362bfcce9bfe8552ff9cad810e 100644 (file)
--- a/board/barco/barco.c
+++ b/board/barco/barco.c
@@ -83,7 +83,7 @@ int checkboard (void)
        return 0;
 }
 
-long int initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        long size;
        long new_bank0_end;
@@ -177,7 +177,7 @@ unsigned update_flash (unsigned char *buf)
                write_flash ((char *)buf, (*buf) & 0xFE);
                *((unsigned char *)0xFF800000) = 0xF0;
                udelay (100);
-               printf ("buf [%#010x] %#010x\n", buf, (*buf));
+               printf ("buf [%#010x] %#010x\n", (unsigned)buf, (*buf));
                /* XXX - fall through??? */
        case BOOT_WORKING :
                return BOOT_WORKING;
@@ -273,10 +273,10 @@ void barcobcd_boot (void)
        /* give length of the kernel image to bootm */
        sprintf (bootm_args[0],"%x",start->size);
        /* give address of the kernel image to bootm */
-       sprintf (bootm_args[1],"%x",buf);
+       sprintf (bootm_args[1],"%x",(unsigned)buf);
 
        printf ("flash address: %#10x\n",start->address+8);
-       printf ("buf address: %#10x\n",buf);
+       printf ("buf address: %#10x\n",(unsigned)buf);
 
        /* aha, we reserve 8 bytes here... */
        for (cnt = 0; cnt < start->size ; cnt++) {