diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-01-24 20:02:02 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-01-24 20:02:02 +0000 |
| commit | cac0cf6daa5df1faed5bc0f7fc764506e93bace0 (patch) | |
| tree | da5a1596ae9201d3f99bb59ec8db0758aa27b03e /target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch | |
| parent | 67ad5ff2734551cf9548814b480a0bc5bacf7f1b (diff) | |
| download | upstream-cac0cf6daa5df1faed5bc0f7fc764506e93bace0.tar.gz upstream-cac0cf6daa5df1faed5bc0f7fc764506e93bace0.tar.bz2 upstream-cac0cf6daa5df1faed5bc0f7fc764506e93bace0.zip | |
kernel: remove linux 3.3 patches and config
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44109 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch deleted file mode 100644 index 231d4548c7..0000000000 --- a/target/linux/generic/patches-3.3/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- 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 -@@ -84,6 +84,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 { -@@ -925,7 +931,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) { |