Merge branch 'next'

[J-u-boot.git] / cmd / onenand.c

diff --git a/cmd/onenand.c b/cmd/onenand.c
index 592985a7ee36704b16e350902927d792f64fa0f7..6e808ce3fce4d1214cfdef8e2f999101e73ad817 100644 (file)
--- a/cmd/onenand.c
+++ b/cmd/onenand.c
@@ -9,9 +9,9 @@
  * published by the Free Software Foundation.
  */
 
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <linux/printk.h>
 
 #include <linux/compat.h>
 #include <linux/mtd/mtd.h>
@@ -53,7 +53,7 @@ static int arg_off_size_onenand(int argc, char *const argv[], ulong *off,
        if (*size == mtd->size)
                puts("whole chip\n");
        else
-               printf("offset 0x%lx, size 0x%x\n", *off, *size);
+               printf("offset 0x%lx, size 0x%zx\n", *off, *size);
 
        return 0;
 }
@@ -401,7 +401,7 @@ static int do_onenand_read(struct cmd_tbl *cmdtp, int flag, int argc,
 
        ret = onenand_block_read(ofs, len, &retlen, (u8 *)addr, oob);
 
-       printf(" %d bytes read: %s\n", retlen, ret ? "ERROR" : "OK");
+       printf(" %zu bytes read: %s\n", retlen, ret ? "ERROR" : "OK");
 
        return ret == 0 ? 0 : 1;
 }
@@ -428,7 +428,7 @@ static int do_onenand_write(struct cmd_tbl *cmdtp, int flag, int argc,
 
        ret = onenand_block_write(ofs, len, &retlen, (u8 *)addr, withoob);
 
-       printf(" %d bytes written: %s\n", retlen, ret ? "ERROR" : "OK");
+       printf(" %zu bytes written: %s\n", retlen, ret ? "ERROR" : "OK");
 
        return ret == 0 ? 0 : 1;
 }
@@ -560,12 +560,6 @@ static struct cmd_tbl cmd_onenand_sub[] = {
        U_BOOT_CMD_MKENT(markbad, CONFIG_SYS_MAXARGS, 0, do_onenand_markbad, "", ""),
 };
 
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-void onenand_reloc(void) {
-       fixup_cmdtable(cmd_onenand_sub, ARRAY_SIZE(cmd_onenand_sub));
-}
-#endif
-
 static int do_onenand(struct cmd_tbl *cmdtp, int flag, int argc,
                      char *const argv[])
 {