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 <[email protected]> Tested-By: Tim Harvey <[email protected]> Reviewed-by: Tom Rini <[email protected]> Signed-off-by: Michael Trimarchi <[email protected]>
imaami · May 20, 2022 · cc98014 · cc98014
1 parent 37a7c37
commit cc98014
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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;