mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 19:37:10 +02:00
75d051e29d
Based on 3.3-rc2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29986 3c298f89-4303-0410-b956-a3cf2f4a3e73
31 lines
968 B
Diff
31 lines
968 B
Diff
--- a/drivers/mtd/redboot.c
|
|
+++ b/drivers/mtd/redboot.c
|
|
@@ -267,14 +267,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);
|