mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
spl: fit: nand: allow for non-page-aligned elements
Add a weak nand_get_mtd function for nand drivers to provide mtd info and use this to set pagesize such that reading of non page-aligned elements can succeed. The spl_load_simple_fit already handles block block access so all we need to do is provide the nand writesize as the block length. Further cleanup of the drivers which use nand_spl_loaders.c such as am335x_spl_bch.c, atmel_nand.c, and nand_spl_simple.c could be done using info from mtd_info instead of statically defined details. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
39cb85043c
commit
aa0032f672
@ -48,17 +48,27 @@ static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs,
|
|||||||
|
|
||||||
sector = *(int *)load->priv;
|
sector = *(int *)load->priv;
|
||||||
offs = sector + nand_spl_adjust_offset(sector, offs - sector);
|
offs = sector + nand_spl_adjust_offset(sector, offs - sector);
|
||||||
|
#else
|
||||||
|
offs *= load->bl_len;
|
||||||
|
size *= load->bl_len;
|
||||||
#endif
|
#endif
|
||||||
err = nand_spl_load_image(offs, size, dst);
|
err = nand_spl_load_image(offs, size, dst);
|
||||||
if (err)
|
if (err)
|
||||||
return 0;
|
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,
|
static int spl_nand_load_element(struct spl_image_info *spl_image,
|
||||||
int offset, struct image_header *header)
|
int offset, struct image_header *header)
|
||||||
{
|
{
|
||||||
|
struct mtd_info *mtd = nand_get_mtd();
|
||||||
|
int bl_len = mtd ? mtd->writesize : 1;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = nand_spl_load_image(offset, sizeof(*header), (void *)header);
|
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.dev = NULL;
|
||||||
load.priv = &offset;
|
load.priv = &offset;
|
||||||
load.filename = NULL;
|
load.filename = NULL;
|
||||||
load.bl_len = 1;
|
load.bl_len = bl_len;
|
||||||
load.read = spl_nand_fit_read;
|
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)) {
|
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
|
||||||
struct spl_load_info load;
|
struct spl_load_info load;
|
||||||
|
|
||||||
load.dev = NULL;
|
load.dev = NULL;
|
||||||
load.priv = NULL;
|
load.priv = NULL;
|
||||||
load.filename = NULL;
|
load.filename = NULL;
|
||||||
load.bl_len = 1;
|
load.bl_len = bl_len;
|
||||||
load.read = spl_nand_fit_read;
|
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 {
|
} else {
|
||||||
err = spl_parse_image_header(spl_image, header);
|
err = spl_parse_image_header(spl_image, header);
|
||||||
if (err)
|
if (err)
|
||||||
|
@ -282,6 +282,11 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct mtd_info *nand_get_mtd(void)
|
||||||
|
{
|
||||||
|
return mtd;
|
||||||
|
}
|
||||||
|
|
||||||
int nand_default_bbt(struct mtd_info *mtd)
|
int nand_default_bbt(struct mtd_info *mtd)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user