leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd: mvebu: bubt: use get_nand_dev_by_index()

Browse Source 
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>
This commit is contained in:
Grygorii Strashko 2017-06-26 19:13:02 -05:00 committed by Tom Rini
parent 88b81bf792
commit 7021c7e6f2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/mvebu/bubt.c
View File

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