zhao/bl-mt798x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot: fix erasing ubi when flash fit firmware

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-10-22 20:39:50 +08:00
committed by hanwckf
parent fb350b9cca
commit 8064c275a5
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uboot-mtk-20220606/board/mediatek/common/ubi_helper.c
View File

@@ -480,7 +480,8 @@ static int write_ubi_fit_image(const void *data, size_t size,
if (!find_ubi_volume("fit")) {
/* ubi is dirty, erase ubi and recreate volumes */
umount_ubi();
ret = mtd_erase_skip_bad(mtd, 0, size, mtd->size, NULL, NULL, true);
ubi_mtd_param_parse(mtd->name, NULL);
ret = mtd_erase_skip_bad(mtd, 0, mtd->size, mtd->size, NULL, NULL, false);
if (ret)
return ret;
@@ -496,8 +497,8 @@ static int write_ubi_fit_image(const void *data, size_t size,
ret = create_ubi_volume(CONFIG_ENV_UBI_VOLUME_REDUND, CONFIG_ENV_SIZE, -1, false);
if (ret)
goto out;
#endif
#endif
#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
#endif /* CONFIG_ENV_IS_IN_UBI */
}
/* Remove this volume first in case of no enough PEBs */

6
uboot-mtk-20230718-09eda825/board/mediatek/common/mtd_helper.c
View File

@@ -657,7 +657,7 @@ static int write_ubi_fit_image(const void *data, size_t size,
if (!ubi_find_volume(PART_FIT_NAME)) {
/* ubi is dirty, erase ubi and recreate volumes */
ubi_exit();
ret = mtd_erase_skip_bad(mtd, 0, size, mtd->size, NULL, NULL, true);
ret = mtd_erase_skip_bad(mtd, 0, mtd->size, mtd->size, NULL, NULL, false);
if (ret)
return ret;
@@ -674,8 +674,8 @@ static int write_ubi_fit_image(const void *data, size_t size,
ret = create_ubi_volume(CONFIG_ENV_UBI_VOLUME_REDUND, CONFIG_ENV_SIZE, UBI_VOL_NUM_AUTO, false);
if (ret)
goto out;
#endif
#endif
#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
#endif /* CONFIG_ENV_IS_IN_UBI */
}
/* Remove this volume first in case of no enough PEBs */