summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2013-10-15 17:41:27 -0500
committerTom Rini <trini@ti.com>2013-10-15 20:03:59 -0400
commit06503f16c34b722ed07cda98aa6e268941c4dd46 (patch)
tree056de38e8630084b4d2780165662e84905c74e42
parent6d5ce1bd0048617d48c05de1a84fae8696081127 (diff)
downloadu-boot-imx-06503f16c34b722ed07cda98aa6e268941c4dd46.zip
u-boot-imx-06503f16c34b722ed07cda98aa6e268941c4dd46.tar.gz
u-boot-imx-06503f16c34b722ed07cda98aa6e268941c4dd46.tar.bz2
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 <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>
-rw-r--r--common/fdt_support.c4
-rw-r--r--fs/cramfs/cramfs.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c
index b034c98..1f0d8f5 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 e578a1e..fd8e4ef 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)