]> git.sur5r.net Git - u-boot/commitdiff
cmd: bootm: fix build when CONFIG_CMD_IMLS_NAND
authorGrygorii Strashko <grygorii.strashko@ti.com>
Tue, 31 Jan 2017 21:37:03 +0000 (15:37 -0600)
committerTom Rini <trini@konsulko.com>
Wed, 8 Feb 2017 20:56:32 +0000 (15:56 -0500)
Now when CONFIG_CMD_IMLS_NAND is enabled the u-boot build will fail,
because nand_read_skip_bad() function has been changed to accept more
parameters, hence fix it.

 CC      cmd/bootm.o
cmd/bootm.c: In function 'nand_imls_legacyimage':
cmd/bootm.c:390:8: error: too few arguments to function 'nand_read_skip_bad'
  ret = nand_read_skip_bad(mtd, off, &len, imgdata);
        ^
In file included from cmd/bootm.c:18:0:
include/nand.h:101:5: note: declared here
 int nand_read_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length,
     ^
 LD      drivers/block/built-in.o

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
cmd/bootm.c

index a7e181d22c4c4072d91b3b34ac5f5fb906bf6fa1..953a57de33996b7b2c3c28cb320fc8420fcc76e2 100644 (file)
@@ -390,7 +390,7 @@ static int nand_imls_legacyimage(struct mtd_info *mtd, int nand_dev,
                return -ENOMEM;
        }
 
-       ret = nand_read_skip_bad(mtd, off, &len, imgdata);
+       ret = nand_read_skip_bad(mtd, off, &len, NULL, mtd->size, imgdata);
        if (ret < 0 && ret != -EUCLEAN) {
                free(imgdata);
                return ret;
@@ -430,7 +430,7 @@ static int nand_imls_fitimage(struct mtd_info *mtd, int nand_dev, loff_t off,
                return -ENOMEM;
        }
 
-       ret = nand_read_skip_bad(mtd, off, &len, imgdata);
+       ret = nand_read_skip_bad(mtd, off, &len, NULL, mtd->size, imgdata);
        if (ret < 0 && ret != -EUCLEAN) {
                free(imgdata);
                return ret;