From: Scott Wood Date: Tue, 15 Oct 2013 22:41:27 +0000 (-0500) Subject: mtd: fix warnings due to 64-bit partition support X-Git-Tag: v2013.10~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=06503f16c34b722ed07cda98aa6e268941c4dd46;p=oweals%2Fu-boot.git mtd: fix warnings due to 64-bit partition support 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 Cc: York Sun Cc: Stefan Roese Cc: Paul Burton Cc: Tom Rini --- diff --git a/common/fdt_support.c b/common/fdt_support.c index b034c9835b..1f0d8f5fe9 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -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) { diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c index e578a1e8bc..fd8e4ef31e 100644 --- a/fs/cramfs/cramfs.c +++ b/fs/cramfs/cramfs.c @@ -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)