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

spl: mtd_blk: support load fit firmware 

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3a32874977a7aa654b8e3fb432e3637b900525ab
This commit is contained in:
Jason Zhu 2020-04-20 20:50:50 +08:00
parent 1540ca3755
commit d300a21655
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/spl/spl_mtd_blk.c
View File

@ -66,7 +66,6 @@ struct blk_desc *find_mtd_device(int dev_num)
return desc; return desc;
} }
#ifdef CONFIG_SPL_LOAD_RKFW
static ulong mtd_spl_load_read(struct spl_load_info *load, ulong sector, static ulong mtd_spl_load_read(struct spl_load_info *load, ulong sector,
ulong count, void *buf) ulong count, void *buf)
{ {
@ -75,6 +74,7 @@ static ulong mtd_spl_load_read(struct spl_load_info *load, ulong sector,
return blk_dread(desc, sector, count, buf); return blk_dread(desc, sector, count, buf);
} }
#ifdef CONFIG_SPL_LOAD_RKFW
int spl_mtd_load_rkfw(struct spl_image_info *spl_image, struct blk_desc *desc) int spl_mtd_load_rkfw(struct spl_image_info *spl_image, struct blk_desc *desc)
{ {
int ret = -1; int ret = -1;
@ -118,15 +118,46 @@ int spl_mtd_load_rkfw(struct spl_image_info *spl_image, struct blk_desc *desc)
int spl_mtd_load_image(struct spl_image_info *spl_image, int spl_mtd_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {
struct image_header *header;
struct blk_desc *desc; struct blk_desc *desc;
int ret = 0; int ret = -1;
desc = find_mtd_device(spl_mtd_get_device_index(bootdev->boot_device)); desc = find_mtd_device(spl_mtd_get_device_index(bootdev->boot_device));
if (!desc) if (!desc)
return -ENODEV; return -ENODEV;
#ifdef CONFIG_SPL_LOAD_RKFW
ret = spl_mtd_load_rkfw(spl_image, desc); if (IS_ENABLED(CONFIG_SPL_LOAD_FIT)) {
header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
sizeof(struct image_header));
ret = blk_dread(desc, CONFIG_SYS_NAND_U_BOOT_OFFS, 1, header);
if (ret != 1)
return -ENODEV;
#ifdef CONFIG_SPL_FIT_IMAGE_MULTIPLE
if (image_get_magic(header) == FDT_MAGIC ||
CONFIG_SPL_FIT_IMAGE_MULTIPLE > 1) {
#else
if (image_get_magic(header) == FDT_MAGIC) {
#endif #endif
struct spl_load_info load;
load.dev = desc;
load.priv = NULL;
load.filename = NULL;
load.bl_len = desc->blksz;
load.read = mtd_spl_load_read;
ret = spl_load_simple_fit(spl_image, &load,
CONFIG_SYS_NAND_U_BOOT_OFFS,
header);
}
} else if (IS_ENABLED(CONFIG_SPL_LOAD_RKFW)) {
#ifdef CONFIG_SPL_LOAD_RKFW
ret = spl_mtd_load_rkfw(spl_image, desc);
#endif
}
return ret; return ret;
} }