diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-01-27 22:08:14 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-01-27 22:08:14 +0000 |
| commit | 211d5e20b747a22503c548be526af42b8e738aaa (patch) | |
| tree | 947a532e8ac13171fb02708912cd731e2a9132eb /target/linux/brcm47xx | |
| parent | d7b5619b97b89cb9c36e46d529fb229769cc201f (diff) | |
| download | upstream-211d5e20b747a22503c548be526af42b8e738aaa.tar.gz upstream-211d5e20b747a22503c548be526af42b8e738aaa.tar.bz2 upstream-211d5e20b747a22503c548be526af42b8e738aaa.zip | |
kernel: backport queued bcm47xxpart changes
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44156 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
2 files changed, 0 insertions, 76 deletions
diff --git a/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch b/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch deleted file mode 100644 index 6f7cdb6ef2..0000000000 --- a/target/linux/brcm47xx/patches-3.14/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4586bc54a322568d5258d6a1b04e361d4a95597b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> -Date: Wed, 12 Nov 2014 09:06:22 +0100 -Subject: [PATCH][RFC] mtd: bcm47xxpart: lower minimal blocksize to 4Ki (from - 64Ki) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some devices like Netgear WNR1000v3 or WGR614v10 have partitions aligned -to 0x1000. Using bigger blocksize stopped us from detecting some parts. - -Signed-off-by: Rafał Miłecki <zajec5@gmail.com> ---- -Most of supported devices use flashes with erasesize 0x10000 (64Ki), so -this change shouldn't affect them (no regressions expected). -Any objections? ---- - drivers/mtd/bcm47xxpart.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -95,8 +95,12 @@ static int bcm47xxpart_parse(struct mtd_ - int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; - bool found_nvram = false; - -- if (blocksize <= 0x10000) -- blocksize = 0x10000; -+ /* -+ * Some really old flashes (like AT45DB*) had smaller erasesize-s, but -+ * partitions were aligned to at least 0x1000 anyway. -+ */ -+ if (blocksize < 0x1000) -+ blocksize = 0x1000; - - /* Alloc */ - parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS, diff --git a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch deleted file mode 100644 index 6f7cdb6ef2..0000000000 --- a/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-lower-minimal-blocksize-to-4Ki-from-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4586bc54a322568d5258d6a1b04e361d4a95597b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> -Date: Wed, 12 Nov 2014 09:06:22 +0100 -Subject: [PATCH][RFC] mtd: bcm47xxpart: lower minimal blocksize to 4Ki (from - 64Ki) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some devices like Netgear WNR1000v3 or WGR614v10 have partitions aligned -to 0x1000. Using bigger blocksize stopped us from detecting some parts. - -Signed-off-by: Rafał Miłecki <zajec5@gmail.com> ---- -Most of supported devices use flashes with erasesize 0x10000 (64Ki), so -this change shouldn't affect them (no regressions expected). -Any objections? ---- - drivers/mtd/bcm47xxpart.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -95,8 +95,12 @@ static int bcm47xxpart_parse(struct mtd_ - int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; - bool found_nvram = false; - -- if (blocksize <= 0x10000) -- blocksize = 0x10000; -+ /* -+ * Some really old flashes (like AT45DB*) had smaller erasesize-s, but -+ * partitions were aligned to at least 0x1000 anyway. -+ */ -+ if (blocksize < 0x1000) -+ blocksize = 0x1000; - - /* Alloc */ - parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS, |