aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-11-03 16:13:33 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-11-03 16:13:33 +0000
commita2d17ea8cf06f36d67c0d8850e580ce21a6bb837 (patch)
tree15c9d10a1c3c5b8cc071618dcf5210a9beaeff37 /target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch
parent55081c6a197789823d03f6c16a47312407c611da (diff)
downloadupstream-a2d17ea8cf06f36d67c0d8850e580ce21a6bb837.tar.gz
upstream-a2d17ea8cf06f36d67c0d8850e580ce21a6bb837.tar.bz2
upstream-a2d17ea8cf06f36d67c0d8850e580ce21a6bb837.zip
target/linux: add preliminary 2.6.37 kernel support
SVN-Revision: 23828
Diffstat (limited to 'target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch')
-rw-r--r--target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch b/target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch
new file mode 100644
index 0000000000..9188cee29c
--- /dev/null
+++ b/target/linux/generic/patches-2.6.37/071-redboot_boardconfig.patch
@@ -0,0 +1,60 @@
+--- 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: