MTD/NAND: Fix printf format warning in nand code

This patch fixes NAND related printf format warning. Those warnings are
now visible since patch dc4b0b38d4aadf08826f6c31270f1eecd27964fd
[Fix printf errors.] by Andrew Klossner has been applied. Thanks, this is
really helpful.

Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index e20c1af3531e635db1d49caf8a1f030f25f1d5c6..cc7c5ba2419725800a4ac6146752b7b25e92719e 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -55,11 +55,11 @@ static int nand_dump(nand_info_t *nand, ulong off)
        off &= ~(nand->oobblock - 1);
        i = nand_read_raw(nand, buf, off, nand->oobblock, nand->oobsize);
        if (i < 0) {
-               printf("Error (%d) reading page %08x\n", i, off);
+               printf("Error (%d) reading page %08lx\n", i, off);
                free(buf);
                return 1;
        }
-       printf("Page %08x dump:\n", off);
+       printf("Page %08lx dump:\n", off);
        i = nand->oobblock >> 4; p = buf;
        while (i--) {
                printf( "\t%02x %02x %02x %02x %02x %02x %02x %02x"
@@ -149,7 +149,7 @@ out:
        if (*size == nand->size)
                puts("whole chip\n");
        else
-               printf("offset 0x%x, size 0x%x\n", *off, *size);
+               printf("offset 0x%lx, size 0x%x\n", *off, *size);
        return 0;
 }
 
@@ -181,7 +181,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                putc('\n');
                for (i = 0; i < CFG_MAX_NAND_DEVICE; i++) {
                        if (nand_info[i].name)
-                               printf("Device %d: %s, sector size %lu KiB\n",
+                               printf("Device %d: %s, sector size %u KiB\n",
                                        i, nand_info[i].name,
                                        nand_info[i].erasesize >> 10);
                }
@@ -238,7 +238,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                printf("\nDevice %d bad blocks:\n", nand_curr_device);
                for (off = 0; off < nand->size; off += nand->erasesize)
                        if (nand_block_isbad(nand, off))
-                               printf("  %08x\n", off);
+                               printf("  %08lx\n", off);
                return 0;
        }
 
@@ -417,7 +417,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                                if (off == nand->size - nand->oobblock
                                    || (s != last_status && off != 0))  {
 
-                                       printf("%08x - %08x: %8d pages %s%s%s\n",
+                                       printf("%08lx - %08lx: %8lu pages %s%s%s\n",
                                               block_start,
                                               off-1,
                                               (off-block_start)/nand->oobblock,

diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c
index 27b5792bcc95aed29149949ec4c0aae7fb7d3187..e44470eb6cc8a7b79088a2a2ccec61c7174477aa 100644 (file)
--- a/drivers/mtd/nand/nand.c
+++ b/drivers/mtd/nand/nand.c
@@ -70,7 +70,7 @@ void nand_init(void)
                if (nand_curr_device == -1)
                        nand_curr_device = i;
        }
-       printf("%lu MiB\n", size / (1024 * 1024));
+       printf("%u MiB\n", size / (1024 * 1024));
 
 #ifdef CFG_NAND_SELECT_DEVICE
        /*

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index c82f77b55587ef601472e0e027f51f852e81c168..828cc338adbd4da11ba113c6b29cb6a6175a635b 100644 (file)
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -154,7 +154,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
        }
 
        if (erase_length < meminfo->erasesize) {
-               printf("Warning: Erase size 0x%08x smaller than one "   \
+               printf("Warning: Erase size 0x%08lx smaller than one "  \
                       "erase block 0x%08x\n",erase_length, meminfo->erasesize);
                printf("         Erasing 0x%08x instead\n", meminfo->erasesize);
                erase_length = meminfo->erasesize;
@@ -498,7 +498,7 @@ int nand_write_opts(nand_info_t *meminfo, const nand_write_options_t *opts)
                         * on (slow) serial consoles
                         */
                        if (percent != percent_complete) {
-                               printf("\rWriting data at 0x%x "
+                               printf("\rWriting data at 0x%lx "
                                       "-- %3d%% complete.",
                                       mtdoffset, percent);
                                percent_complete = percent;
@@ -678,7 +678,7 @@ int nand_read_opts(nand_info_t *meminfo, const nand_read_options_t *opts)
                         */
                        if (percent != percent_complete) {
                        if (!opts->quiet)
-                               printf("\rReading data from 0x%x "
+                               printf("\rReading data from 0x%lx "
                                       "-- %3d%% complete.",
                                       mtdoffset, percent);
                                percent_complete = percent;