summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMichael Trimarchi <michael@amarulasolutions.com>2022-05-15 12:35:33 +0300
committerStefano Babic <sbabic@denx.de>2022-05-20 13:36:48 +0300
commitcc980143c01e76ff17004021777c2a65dcde367a (patch)
tree9af0b8c51d1dd9c9ef29b83c7350272986a34b57 /common
parent37a7c374a6bd6cefe24516e5aef13d2bab6f133e (diff)
downloadu-boot-cc980143c01e76ff17004021777c2a65dcde367a.tar.xz
spl: spl_nand: Fix bad block handling in fitImage
If the fitImage has some bad block in fit image area, the offset must be recalulcated. This should be done always. After implementing it in mxs now is possible to call the function even for that platform. Cc: Fabio Estevam <festevam@gmail.com> Tested-By: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Tom Rini <trini@konsulko.com> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl_nand.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index fc61b447a5..82a10ffa63 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -43,15 +43,12 @@ static ulong spl_nand_fit_read(struct spl_load_info *load, ulong offs,
ulong size, void *dst)
{
int err;
-#ifdef CONFIG_SYS_NAND_BLOCK_SIZE
ulong sector;
sector = *(int *)load->priv;
- offs = sector + nand_spl_adjust_offset(sector, offs - sector);
-#else
offs *= load->bl_len;
size *= load->bl_len;
-#endif
+ offs = sector + nand_spl_adjust_offset(sector, offs - sector);
err = nand_spl_load_image(offs, size, dst);
if (err)
return 0;