mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-14 22:10:36 +02:00
05535c2766
This fixes the issues with the jffs2 images on various boards. Using JFFS2 on devices with 4KiB erase sectors is not safe: http://lists.infradead.org/pipermail/linux-mtd/2011-June/036591.html git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29521 3c298f89-4303-0410-b956-a3cf2f4a3e73
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
--- a/drivers/mtd/devices/Kconfig
|
|
+++ b/drivers/mtd/devices/Kconfig
|
|
@@ -102,6 +102,14 @@ config M25PXX_USE_FAST_READ
|
|
help
|
|
This option enables FAST_READ access supported by ST M25Pxx.
|
|
|
|
+config M25PXX_PREFER_SMALL_SECTOR_ERASE
|
|
+ bool "Prefer small sector erase"
|
|
+ depends on MTD_M25P80
|
|
+ default y
|
|
+ help
|
|
+ This option enables use of the small erase sectors if that is
|
|
+ supported by the flash chip.
|
|
+
|
|
config MTD_SST25L
|
|
tristate "Support SST25L (non JEDEC) SPI Flash chips"
|
|
depends on SPI_MASTER
|
|
--- a/drivers/mtd/devices/m25p80.c
|
|
+++ b/drivers/mtd/devices/m25p80.c
|
|
@@ -83,6 +83,12 @@
|
|
|
|
#define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16)
|
|
|
|
+#ifdef CONFIG_M25PXX_PREFER_SMALL_SECTOR_ERASE
|
|
+#define PREFER_SMALL_SECTOR_ERASE 1
|
|
+#else
|
|
+#define PREFER_SMALL_SECTOR_ERASE 0
|
|
+#endif
|
|
+
|
|
/****************************************************************************/
|
|
|
|
struct m25p {
|
|
@@ -924,7 +930,7 @@ static int __devinit m25p_probe(struct s
|
|
flash->mtd.write = m25p80_write;
|
|
|
|
/* prefer "small sector" erase if possible */
|
|
- if (info->flags & SECT_4K) {
|
|
+ if (PREFER_SMALL_SECTOR_ERASE && (info->flags & SECT_4K)) {
|
|
flash->erase_opcode = OPCODE_BE_4K;
|
|
flash->mtd.erasesize = 4096;
|
|
} else if (info->flags & SECT_4K_PMC) {
|