mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-05 12:30:38 +02:00
4d4c41d673
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26692 3c298f89-4303-0410-b956-a3cf2f4a3e73
61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
--- a/drivers/mtd/redboot.c
|
|
+++ b/drivers/mtd/redboot.c
|
|
@@ -29,6 +29,8 @@
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
+#define BOARD_CONFIG_PART "boardconfig"
|
|
+
|
|
struct fis_image_desc {
|
|
unsigned char name[16]; // Null terminated name
|
|
uint32_t flash_base; // Address within FLASH of image
|
|
@@ -59,6 +61,7 @@ static int parse_redboot_partitions(stru
|
|
struct mtd_partition **pparts,
|
|
unsigned long fis_origin)
|
|
{
|
|
+ unsigned long max_offset = 0;
|
|
int nrparts = 0;
|
|
struct fis_image_desc *buf;
|
|
struct mtd_partition *parts;
|
|
@@ -227,14 +230,14 @@ static int parse_redboot_partitions(stru
|
|
}
|
|
}
|
|
#endif
|
|
- parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
|
|
+ parts = kzalloc(sizeof(*parts) * (nrparts + 1) + nulllen + namelen + sizeof(BOARD_CONFIG_PART), GFP_KERNEL);
|
|
|
|
if (!parts) {
|
|
ret = -ENOMEM;
|
|
goto out;
|
|
}
|
|
|
|
- nullname = (char *)&parts[nrparts];
|
|
+ nullname = (char *)&parts[nrparts + 1];
|
|
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
|
|
if (nulllen > 0) {
|
|
strcpy(nullname, nullstring);
|
|
@@ -253,6 +256,8 @@ static int parse_redboot_partitions(stru
|
|
}
|
|
#endif
|
|
for ( ; i<nrparts; i++) {
|
|
+ if(max_offset < buf[i].flash_base + buf[i].size)
|
|
+ max_offset = buf[i].flash_base + buf[i].size;
|
|
parts[i].size = fl->img->size;
|
|
parts[i].offset = fl->img->flash_base;
|
|
parts[i].name = names;
|
|
@@ -286,6 +291,14 @@ static int parse_redboot_partitions(stru
|
|
fl = fl->next;
|
|
kfree(tmp_fl);
|
|
}
|
|
+ if(master->size - max_offset >= master->erasesize)
|
|
+ {
|
|
+ parts[nrparts].size = master->size - max_offset;
|
|
+ parts[nrparts].offset = max_offset;
|
|
+ parts[nrparts].name = names;
|
|
+ strcpy(names, BOARD_CONFIG_PART);
|
|
+ nrparts++;
|
|
+ }
|
|
ret = nrparts;
|
|
*pparts = parts;
|
|
out:
|