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

spl: nand: Remove spl_nand_legacy_read

Browse Source 
Now that spl_nand_fit_read works in units of bytes, it can be combined with
spl_nand_legacy_read. Rename the resulting function spl_nand_read, since it
is no longer FIT-specific.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson
2023-11-08 11:48:44 -05:00
committed by Tom Rini
parent 5271e359a4
commit 0ddfa868ba
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/spl/spl_nand.c
View File

@@ -42,29 +42,22 @@ static int spl_nand_load_image(struct spl_image_info *spl_image,
} }
#else #else
static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs, __weak u32 nand_spl_adjust_offset(u32 sector, u32 offs)
ulong size, void *dst) {
return offs;
}
static ulong spl_nand_read(struct spl_load_info *load, ulong offs, ulong size,
void *dst)
{ {
int err; int err;
ulong sector; ulong sector;
sector = *(int *)load->priv;
offs = sector + nand_spl_adjust_offset(sector, offs - sector);
err = nand_spl_load_image(offs, size, dst);
if (err)
return 0;
return size;
}
static ulong spl_nand_legacy_read(struct spl_load_info *load, ulong offs,
ulong size, void *dst)
{
int err;
debug("%s: offs %lx, size %lx, dst %p\n", debug("%s: offs %lx, size %lx, dst %p\n",
__func__, offs, size, dst); __func__, offs, size, dst);
sector = *(int *)load->priv;
offs = sector + nand_spl_adjust_offset(sector, offs - sector);
err = nand_spl_load_image(offs, size, dst); err = nand_spl_load_image(offs, size, dst);
if (err) if (err)
return 0; return 0;
@@ -91,7 +84,7 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
debug("Found FIT\n"); debug("Found FIT\n");
load.priv = &offset; load.priv = &offset;
spl_set_bl_len(&load, bl_len); spl_set_bl_len(&load, bl_len);
load.read = spl_nand_fit_read; load.read = spl_nand_read;
return spl_load_simple_fit(spl_image, &load, offset, header); return spl_load_simple_fit(spl_image, &load, offset, header);
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) && } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) { valid_container_hdr((void *)header)) {
@@ -99,16 +92,16 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
load.priv = &offset; load.priv = &offset;
spl_set_bl_len(&load, bl_len); spl_set_bl_len(&load, bl_len);
load.read = spl_nand_fit_read; load.read = spl_nand_read;
return spl_load_imx_container(spl_image, &load, offset); return spl_load_imx_container(spl_image, &load, offset);
} else if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT) && } else if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT) &&
image_get_magic(header) == IH_MAGIC) { image_get_magic(header) == IH_MAGIC) {
struct spl_load_info load; struct spl_load_info load;
debug("Found legacy image\n"); debug("Found legacy image\n");
load.priv = &offset;
spl_set_bl_len(&load, IS_ENABLED(CONFIG_SPL_LZMA) ? bl_len : 1); spl_set_bl_len(&load, IS_ENABLED(CONFIG_SPL_LZMA) ? bl_len : 1);
load.read = spl_nand_legacy_read; load.read = spl_nand_read;
return spl_load_legacy_img(spl_image, bootdev, &load, offset, header); return spl_load_legacy_img(spl_image, bootdev, &load, offset, header);
} else { } else {
err = spl_parse_image_header(spl_image, bootdev, header); err = spl_parse_image_header(spl_image, bootdev, header);