aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2008-08-19 18:07:57 +0000
committerJohn Crispin <blogic@openwrt.org>2008-08-19 18:07:57 +0000
commitaf445bdcb27a7d6bce4e9303c0501de2cbfcdb7e (patch)
tree3b8ba727709a2921500f2277e12d573adb018fb1 /target
parent8e57efd8d793acf98e8328b3704c99e20cf47b80 (diff)
downloadupstream-af445bdcb27a7d6bce4e9303c0501de2cbfcdb7e.tar.gz
upstream-af445bdcb27a7d6bce4e9303c0501de2cbfcdb7e.tar.bz2
upstream-af445bdcb27a7d6bce4e9303c0501de2cbfcdb7e.zip
redboot.c - adds implicit creation of boardconfig partition
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12340 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch
new file mode 100644
index 0000000000..48c7d52cb7
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch
@@ -0,0 +1,62 @@
+Index: linux-2.6.26.2/drivers/mtd/redboot.c
+===================================================================
+--- linux-2.6.26.2.orig/drivers/mtd/redboot.c 2008-08-19 19:32:17.000000000 +0200
++++ linux-2.6.26.2/drivers/mtd/redboot.c 2008-08-19 19:47:34.000000000 +0200
+@@ -13,6 +13,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
+@@ -43,6 +45,7 @@
+ 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;
+@@ -217,14 +220,14 @@
+ }
+ }
+ #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);
+@@ -243,6 +246,8 @@
+ }
+ #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;
+@@ -276,6 +281,14 @@
+ 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: