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 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index b752927..bb9b7ed 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -309,24 +309,22 @@ static int is_spi_active(void) #ifdef CONFIG_CMD_NAND static int nand_burn_image(size_t image_size) { + struct mtd_info *mtd; int ret, block_size; - nand_info_t *nand; - int dev = nand_curr_device;
- 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; @@ -336,7 +334,7 @@ static int nand_burn_image(size_t image_size) /* Write the image to flash */ printf("Writing image:..."); printf("&image_size = 0x%p\n", (void *)&image_size); - 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