diff options
author | John Crispin <john@openwrt.org> | 2012-11-12 07:56:37 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2012-11-12 07:56:37 +0000 |
commit | 5f30fe31b66da19cee1e9787cf084db23553a9ff (patch) | |
tree | 16ea187a85873b0caaf8fbdb90a9482b708c9a8a /target/linux/generic/patches-3.3 | |
parent | 527c4736742b1a6133808047b7d37e5b074bd307 (diff) | |
download | upstream-5f30fe31b66da19cee1e9787cf084db23553a9ff.tar.gz upstream-5f30fe31b66da19cee1e9787cf084db23553a9ff.tar.bz2 upstream-5f30fe31b66da19cee1e9787cf084db23553a9ff.zip |
move redboot boardconfig patch into target folder
SVN-Revision: 34166
Diffstat (limited to 'target/linux/generic/patches-3.3')
-rw-r--r-- | target/linux/generic/patches-3.3/421-redboot_boardconfig.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/target/linux/generic/patches-3.3/421-redboot_boardconfig.patch b/target/linux/generic/patches-3.3/421-redboot_boardconfig.patch deleted file mode 100644 index db8377b303..0000000000 --- a/target/linux/generic/patches-3.3/421-redboot_boardconfig.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -30,6 +30,8 @@ - #include <linux/mtd/partitions.h> - #include <linux/module.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 -@@ -60,6 +62,7 @@ static int parse_redboot_partitions(stru - struct mtd_partition **pparts, - struct mtd_part_parser_data *data) - { -+ 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: |