|
@@ -48,17 +48,27 @@ static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs,
|
|
|
|
|
|
sector = *(int *)load->priv;
|
|
|
offs = sector + nand_spl_adjust_offset(sector, offs - sector);
|
|
|
+#else
|
|
|
+ offs *= load->bl_len;
|
|
|
+ size *= load->bl_len;
|
|
|
#endif
|
|
|
err = nand_spl_load_image(offs, size, dst);
|
|
|
if (err)
|
|
|
return 0;
|
|
|
|
|
|
- return size;
|
|
|
+ return size / load->bl_len;
|
|
|
+}
|
|
|
+
|
|
|
+struct mtd_info * __weak nand_get_mtd(void)
|
|
|
+{
|
|
|
+ return NULL;
|
|
|
}
|
|
|
|
|
|
static int spl_nand_load_element(struct spl_image_info *spl_image,
|
|
|
int offset, struct image_header *header)
|
|
|
{
|
|
|
+ struct mtd_info *mtd = nand_get_mtd();
|
|
|
+ int bl_len = mtd ? mtd->writesize : 1;
|
|
|
int err;
|
|
|
|
|
|
err = nand_spl_load_image(offset, sizeof(*header), (void *)header);
|
|
@@ -73,18 +83,18 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
|
|
|
load.dev = NULL;
|
|
|
load.priv = &offset;
|
|
|
load.filename = NULL;
|
|
|
- load.bl_len = 1;
|
|
|
+ load.bl_len = bl_len;
|
|
|
load.read = spl_nand_fit_read;
|
|
|
- return spl_load_simple_fit(spl_image, &load, offset, header);
|
|
|
+ return spl_load_simple_fit(spl_image, &load, offset / bl_len, header);
|
|
|
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
|
|
|
struct spl_load_info load;
|
|
|
|
|
|
load.dev = NULL;
|
|
|
load.priv = NULL;
|
|
|
load.filename = NULL;
|
|
|
- load.bl_len = 1;
|
|
|
+ load.bl_len = bl_len;
|
|
|
load.read = spl_nand_fit_read;
|
|
|
- return spl_load_imx_container(spl_image, &load, offset);
|
|
|
+ return spl_load_imx_container(spl_image, &load, offset / bl_len);
|
|
|
} else {
|
|
|
err = spl_parse_image_header(spl_image, header);
|
|
|
if (err)
|