cmd: mvebu: bubt: use get_nand_dev_by_index()
authorGrygorii Strashko <grygorii.strashko@ti.com>
Tue, 27 Jun 2017 00:13:02 +0000 (19:13 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 12 Jul 2017 02:41:49 +0000 (22:41 -0400)
As part of preparation for nand DM conversion the new API has been
introduced to remove direct access to nand_info array. So, use it here
instead of accessing to nand_info array directly.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
cmd/mvebu/bubt.c

index 1e1f0af..ea46e7b 100644 (file)
@@ -311,23 +311,21 @@ static int nand_burn_image(size_t image_size)
 {
        int ret;
        uint32_t block_size;
-       struct mtd_info *nand;
-       int dev = nand_curr_device;
+       struct mtd_info *mtd;
 
-       if ((dev < 0) || (dev >= CONFIG_SYS_MAX_NAND_DEVICE) ||
-           (!nand_info[dev]->name)) {
+       mtd = get_nand_dev_by_index(nand_curr_device);
+       if (!mtd) {
                puts("\nno devices available\n");
                return -ENOMEDIUM;
        }
-       nand = nand_info[dev];
-       block_size = nand->erasesize;
+       block_size = mtd->erasesize;
 
        /* Align U-Boot size to currently used blocksize */
        image_size = ((image_size + (block_size - 1)) & (~(block_size - 1)));
 
        /* Erase the U-BOOT image space */
        printf("Erasing 0x%x - 0x%x:...", 0, (int)image_size);
-       ret = nand_erase(nand, 0, image_size);
+       ret = nand_erase(mtd, 0, image_size);
        if (ret) {
                printf("Error!\n");
                goto error;
@@ -337,7 +335,7 @@ static int nand_burn_image(size_t image_size)
        /* Write the image to flash */
        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());
+       ret = nand_write(mtd, 0, &image_size, (void *)get_load_addr());
        if (ret)
                printf("Error!\n");
        else