a3d2448fae
This fixes:
drivers/mtd/redboot.c:299:34: error: array type has incomplete element type 'struct of_device_id'
Fixes: 5e8b4be531 ("kernel: add DT binding support to the mtd redboot parser")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: add patch for including unpartitioned space in the rootfs partition for redboot devices (if applicable)
|
|
|
|
[john@phrozen.org: used by ixp and others]
|
|
|
|
lede-commit: 394918851f84e4d00fa16eb900e7700e95091f00
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
drivers/mtd/redboot.c | 19 +++++++++++++------
|
|
1 file changed, 13 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/mtd/redboot.c
|
|
+++ b/drivers/mtd/redboot.c
|
|
@@ -266,14 +266,21 @@ static int parse_redboot_partitions(stru
|
|
#endif
|
|
names += strlen(names)+1;
|
|
|
|
-#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
|
|
if(fl->next && fl->img->flash_base + fl->img->size + master->erasesize <= fl->next->img->flash_base) {
|
|
- i++;
|
|
- parts[i].offset = parts[i-1].size + parts[i-1].offset;
|
|
- parts[i].size = fl->next->img->flash_base - parts[i].offset;
|
|
- parts[i].name = nullname;
|
|
- }
|
|
+ if (!strcmp(parts[i].name, "rootfs")) {
|
|
+ parts[i].size = fl->next->img->flash_base;
|
|
+ parts[i].size &= ~(master->erasesize - 1);
|
|
+ parts[i].size -= parts[i].offset;
|
|
+#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
|
|
+ nrparts--;
|
|
+ } else {
|
|
+ i++;
|
|
+ parts[i].offset = parts[i-1].size + parts[i-1].offset;
|
|
+ parts[i].size = fl->next->img->flash_base - parts[i].offset;
|
|
+ parts[i].name = nullname;
|
|
#endif
|
|
+ }
|
|
+ }
|
|
tmp_fl = fl;
|
|
fl = fl->next;
|
|
kfree(tmp_fl);
|