karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / common / cmd_mtdparts.c

diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c
index 3cb0571df39a4dc0797f93df887dea76768f6484..3e34558acfd1a38ec4527e2618cf9db9ea7271fd 100644 (file)
--- a/common/cmd_mtdparts.c
+++ b/common/cmd_mtdparts.c
@@ -325,8 +325,7 @@ static int part_validate_eraseblock(struct mtdids *id, struct part_info *part)
                 */
                offset = part->offset;
                if (do_div(offset, mtd->erasesize)) {
-                       printf("%s%d: partition (%s) start offset"
-                              "alignment incorrect\n",
+                       printf("%s%d: partition (%s) start offset alignment incorrect\n",
                               MTD_DEV_TYPE(id->type), id->num, part->name);
                        return 1;
                }
@@ -862,7 +861,7 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_
        debug("dev type = %d (%s), dev num = %d, mtd-id = %s\n",
                        id->type, MTD_DEV_TYPE(id->type),
                        id->num, id->mtd_id);
-       debug("parsing partitions %.*s\n", (pend ? pend - p : strlen(p)), p);
+       debug("parsing partitions %.*s\n", (int)(pend ? pend - p : strlen(p)), p);
 
 
        /* parse partitions */
@@ -1007,7 +1006,7 @@ static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_
        list_for_each(entry, &mtdids) {
                id = list_entry(entry, struct mtdids, link);
 
-               debug("entry: '%s' (len = %d)\n",
+               debug("entry: '%s' (len = %zu)\n",
                                id->mtd_id, strlen(id->mtd_id));
 
                if (mtd_id_len != strlen(id->mtd_id))