qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: mtd_blk: support get image sector address by part info 

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I85d5433ce165a8b027e485c694315c492467c6d9
This commit is contained in:
Jason Zhu 2020-10-23 14:53:49 +08:00 committed by Jianhong Chen
parent 46e7ba36f6
commit 516562c2d3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/spl/spl_mtd_blk.c
View File

@ -5,6 +5,7 @@
#include <common.h>
#include <blk.h>
#include <boot_rkimg.h>
#include <dm.h>
#include <errno.h>
#include <image.h>
@ -105,17 +106,24 @@ int spl_mtd_load_image(struct spl_image_info *spl_image,
struct image_header *header;
struct blk_desc *desc;
int ret = -1;
lbaint_t image_sector = CONFIG_MTD_BLK_U_BOOT_OFFS;
desc = find_mtd_device(spl_mtd_get_device_index(bootdev->boot_device));
if (!desc)
return -ENODEV;
#ifdef CONFIG_SPL_LIBDISK_SUPPORT
disk_partition_t info;
mtd_blk_map_partitions(desc);
ret = part_get_info_by_name(desc, PART_UBOOT, &info);
if (ret > 0)
image_sector = info.start;
#endif
if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
sizeof(struct image_header));
ret = blk_dread(desc, CONFIG_MTD_BLK_U_BOOT_OFFS, 1, header);
ret = blk_dread(desc, image_sector, 1, header);
if (ret != 1)
return -ENODEV;
@ -134,7 +142,7 @@ int spl_mtd_load_image(struct spl_image_info *spl_image,
load.read = mtd_spl_load_read;
ret = spl_load_simple_fit(spl_image, &load,
CONFIG_MTD_BLK_U_BOOT_OFFS,
image_sector,
header);
}
}