aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/421-redboot_boardconfig.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-27 15:01:09 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-27 15:01:09 +0000
commitde4c4d35e17830170dba6aa1b3b025d93a7b3302 (patch)
treec57b3c28c8453826a6abcef3f83b80d72f732253 /target/linux/generic/patches-3.1/421-redboot_boardconfig.patch
parentcead4b47abdebcb8506451b4a3e30028982161a1 (diff)
downloadupstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.tar.gz
upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.tar.bz2
upstream-de4c4d35e17830170dba6aa1b3b025d93a7b3302.zip
linux/3.1: R.I.P.
SVN-Revision: 31891
Diffstat (limited to 'target/linux/generic/patches-3.1/421-redboot_boardconfig.patch')
-rw-r--r--target/linux/generic/patches-3.1/421-redboot_boardconfig.patch60
1 files changed, 0 insertions, 60 deletions
diff --git a/target/linux/generic/patches-3.1/421-redboot_boardconfig.patch b/target/linux/generic/patches-3.1/421-redboot_boardconfig.patch
deleted file mode 100644
index 9188cee29c..0000000000
--- a/target/linux/generic/patches-3.1/421-redboot_boardconfig.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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: