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

uboot: refine fit ubootenv creation

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-09-12 14:03:00 +08:00
committed by hanwckf
parent 15fd81d31d
commit 8dddf4ec0a
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -531,13 +531,16 @@ static int write_ubi_fit_image(const void *data, size_t size,
if (ret)
return ret;
ret = create_ubi_volume("ubootenv", 0x100000, -1, false);
#ifdef CONFIG_ENV_IS_IN_UBI
ret = create_ubi_volume(CONFIG_ENV_UBI_VOLUME, CONFIG_ENV_SIZE, -1, false);
if (ret)
goto out;
ret = create_ubi_volume("ubootenv2", 0x100000, -1, false);
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
ret = create_ubi_volume(CONFIG_ENV_UBI_VOLUME_REDUND, CONFIG_ENV_SIZE, -1, false);
if (ret)
goto out;
#endif
#endif
}
/* Remove this volume first in case of no enough PEBs */

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

@@ -655,13 +655,17 @@ static int write_ubi_fit_image(const void *data, size_t size,
if (ret)
return ret;
ret = create_ubi_volume("ubootenv", 0x100000, -1, false);
#ifdef CONFIG_ENV_IS_IN_UBI
ret = create_ubi_volume(CONFIG_ENV_UBI_VOLUME, CONFIG_ENV_SIZE, UBI_VOL_NUM_AUTO, false);
if (ret)
goto out;
ret = create_ubi_volume("ubootenv2", 0x100000, -1, false);
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
ret = create_ubi_volume(CONFIG_ENV_UBI_VOLUME_REDUND, CONFIG_ENV_SIZE, UBI_VOL_NUM_AUTO, false);
if (ret)
goto out;
#endif
#endif
}
/* Remove this volume first in case of no enough PEBs */