]> git.sur5r.net Git - u-boot/commitdiff
mtd: fix warnings due to 64-bit partition support
authorScott Wood <scottwood@freescale.com>
Tue, 15 Oct 2013 22:41:27 +0000 (17:41 -0500)
committerTom Rini <trini@ti.com>
Wed, 16 Oct 2013 00:03:59 +0000 (20:03 -0400)
commit 39ac34473f3c96e77cbe03a49141771ed1639486 ("cmd_mtdparts: use 64
bits for flash size, partition size & offset") introduced warnings
in a couple places due to printf formats or pointer casting.

This patch fixes the warnings pointed out here:
http://lists.denx.de/pipermail/u-boot/2013-October/164981.html

Signed-off-by: Scott Wood <scottwood@freescale.com>
Cc: York Sun <yorksun@freescale.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Tom Rini <trini@ti.com>
common/fdt_support.c
fs/cramfs/cramfs.c

index b034c9835ba747aee9be296332db43a54ef00bd9..1f0d8f5fe9a3348addd99255b4538dd3830fd424 100644 (file)
@@ -766,11 +766,11 @@ int fdt_node_set_part_info(void *blob, int parent_offset,
 
                part = list_entry(pentry, struct part_info, link);
 
-               debug("%2d: %-20s0x%08x\t0x%08x\t%d\n",
+               debug("%2d: %-20s0x%08llx\t0x%08llx\t%d\n",
                        part_num, part->name, part->size,
                        part->offset, part->mask_flags);
 
-               sprintf(buf, "partition@%x", part->offset);
+               sprintf(buf, "partition@%llx", part->offset);
 add_sub:
                ret = fdt_add_subnode(blob, parent_offset, buf);
                if (ret == -FDT_ERR_NOSPACE) {
index e578a1e8bc82b2d79a0394c4c77409669f0ec38c..fd8e4ef31e6b7c42d589b3a62726ebbc025ceccc 100644 (file)
@@ -43,9 +43,10 @@ struct cramfs_super super;
  * device address space offset, so we need to shift it by a device start address. */
 #if !defined(CONFIG_SYS_NO_FLASH)
 extern flash_info_t flash_info[];
-#define PART_OFFSET(x) (x->offset + flash_info[x->dev->id->num].start[0])
+#define PART_OFFSET(x) ((ulong)x->offset + \
+                        flash_info[x->dev->id->num].start[0])
 #else
-#define PART_OFFSET(x) (x->offset)
+#define PART_OFFSET(x) ((ulong)x->offset)
 #endif
 
 static int cramfs_read_super (struct part_info *info)