ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-21 03:55:06 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

kernel: mtdsplit: support UBI after FIT images

Browse Source 
Change the partition name accordingly. Same behavior as mtdsplit_uimage

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry-picked from commit 62fd9f9709)
This commit is contained in:
Felix Fietkau 2022-03-10 17:32:20 +01:00
parent 329b1543f3
commit fb31038e1f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_fit.c
View File

@ -256,9 +256,11 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
* last external data refernced. * last external data refernced.
*/ */
if (fit_size > 0x1000) { if (fit_size > 0x1000) {
enum mtdsplit_part_type type;
/* Search for the rootfs partition after the FIT image */ /* Search for the rootfs partition after the FIT image */
ret = mtd_find_rootfs_from(mtd, fit_offset + fit_size, mtd->size, ret = mtd_find_rootfs_from(mtd, fit_offset + fit_size, mtd->size,
&rootfs_offset, NULL); &rootfs_offset, &type);
if (ret) { if (ret) {
pr_info("no rootfs found after FIT image in \"%s\"\n", pr_info("no rootfs found after FIT image in \"%s\"\n",
mtd->name); mtd->name);
@ -275,7 +277,10 @@ mtdsplit_fit_parse(struct mtd_info *mtd,
parts[0].offset = fit_offset; parts[0].offset = fit_offset;
parts[0].size = mtd_rounddown_to_eb(fit_size, mtd) + mtd->erasesize; parts[0].size = mtd_rounddown_to_eb(fit_size, mtd) + mtd->erasesize;
parts[1].name = ROOTFS_PART_NAME; if (type == MTDSPLIT_PART_TYPE_UBI)
parts[1].name = UBI_PART_NAME;
else
parts[1].name = ROOTFS_PART_NAME;
parts[1].offset = rootfs_offset; parts[1].offset = rootfs_offset;
parts[1].size = rootfs_size; parts[1].size = rootfs_size;