]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm64: mvebu: Fix the bubt comamnd NAND device support
authorKonstantin Porotchkin <kostap@marvell.com>
Tue, 28 Mar 2017 15:16:56 +0000 (18:16 +0300)
committerStefan Roese <sr@denx.de>
Tue, 9 May 2017 11:38:18 +0000 (13:38 +0200)
Fix the NAND structures in bubt command according to latest
changes in MTD API.

Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Igal Liberman <igall@marvell.com>
Cc: Nadav Haklai <nadavh@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>
cmd/mvebu/bubt.c

index b752927e8c690eb18f0ff328c1e5af85cb3ac8d4..1e1f0af35cc0b86c7f55836bcb3368c15d1a46e2 100644 (file)
@@ -309,16 +309,17 @@ static int is_spi_active(void)
 #ifdef CONFIG_CMD_NAND
 static int nand_burn_image(size_t image_size)
 {
-       int ret, block_size;
-       nand_info_t *nand;
+       int ret;
+       uint32_t block_size;
+       struct mtd_info *nand;
        int dev = nand_curr_device;
 
        if ((dev < 0) || (dev >= CONFIG_SYS_MAX_NAND_DEVICE) ||
-           (!nand_info[dev].name)) {
+           (!nand_info[dev]->name)) {
                puts("\nno devices available\n");
                return -ENOMEDIUM;
        }
-       nand = &nand_info[dev];
+       nand = nand_info[dev];
        block_size = nand->erasesize;
 
        /* Align U-Boot size to currently used blocksize */
@@ -334,8 +335,8 @@ static int nand_burn_image(size_t image_size)
        printf("Done!\n");
 
        /* Write the image to flash */
-       printf("Writing image:...");
-       printf("&image_size = 0x%p\n", (void *)&image_size);
+       printf("Writing %d bytes from 0x%lx to offset 0 ... ",
+              (int)image_size, get_load_addr());
        ret = nand_write(nand, 0, &image_size, (void *)get_load_addr());
        if (ret)
                printf("Error!\n");