summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.38/071-redboot_boardconfig.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-01-21 17:52:22 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-01-21 17:52:22 +0000
commitc700e57cc7b1ec4cd15dc1d5342bc9053308b8b8 (patch)
treefffe1ce8f0bbf431763fbb40f3388dc5e1d4ed8b /target/linux/generic/patches-2.6.38/071-redboot_boardconfig.patch
parent02bf1599a3b87a41686bf1cb78d62fe71040b192 (diff)
downloadmtk-20170518-c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8.zip
mtk-20170518-c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8.tar.gz
mtk-20170518-c700e57cc7b1ec4cd15dc1d5342bc9053308b8b8.tar.bz2
preliminary 2.6.38 support
SVN-Revision: 25057
Diffstat (limited to 'target/linux/generic/patches-2.6.38/071-redboot_boardconfig.patch')
-rw-r--r--target/linux/generic/patches-2.6.38/071-redboot_boardconfig.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.38/071-redboot_boardconfig.patch b/target/linux/generic/patches-2.6.38/071-redboot_boardconfig.patch
new file mode 100644
index 0000000..9188cee
--- /dev/null
+++ b/target/linux/generic/patches-2.6.38/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: