aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/linux-2.4
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-08-24 00:18:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-08-24 00:18:33 +0000
commitf481279bd492aafa7a4aba4d7e6c9d53d8595b04 (patch)
treec0bedf07f41f8d061a2d2bef2f50c0f6851912ea /target/linux/linux-2.4
parentf611da2a8b9035d85ee636b315fa053a1cb6470c (diff)
downloadupstream-f481279bd492aafa7a4aba4d7e6c9d53d8595b04.tar.gz
upstream-f481279bd492aafa7a4aba4d7e6c9d53d8595b04.tar.bz2
upstream-f481279bd492aafa7a4aba4d7e6c9d53d8595b04.zip
fix ar7 flash map driver handling of jffs2 images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1743 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.4')
-rw-r--r--target/linux/linux-2.4/patches/ar7/001-flash_map.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/linux-2.4/patches/ar7/001-flash_map.patch b/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
index df73515809..83bc103bef 100644
--- a/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
+++ b/target/linux/linux-2.4/patches/ar7/001-flash_map.patch
@@ -1,7 +1,7 @@
diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-flash.c
--- linux.old/drivers/mtd/maps/ar7-flash.c 1970-01-01 01:00:00.000000000 +0100
+++ linux.dev/drivers/mtd/maps/ar7-flash.c 2005-07-22 04:35:26.624453992 +0200
-@@ -0,0 +1,265 @@
+@@ -0,0 +1,267 @@
+/*
+ * $Id$
+ *
@@ -240,8 +240,10 @@ diff -urN linux.old/drivers/mtd/maps/ar7-flash.c linux.dev/drivers/mtd/maps/ar7-
+ ar7_partinfo[p++].mask_flags = 0;
+ } else {
+ printk("Unknown filesystem. Moving rootfs partition to next erase block");
-+ if ((rootfs_start % ar7_mtd_info->erasesize) > 0)
-+ rootfs_start += ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
++ if ((rootfs_start % ar7_mtd_info->erasesize) > 0) {
++ ar7_partinfo[p - 2].offset += ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
++ ar7_partinfo[p - 2].size -= ar7_mtd_info->erasesize - (rootfs_start % ar7_mtd_info->erasesize);
++ }
+ }
+
+ return p;