mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-01 05:18:08 +02:00
155c111782
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22803 3c298f89-4303-0410-b956-a3cf2f4a3e73
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
@@ -39,7 +39,7 @@
|
|
#include <linux/mtd/xip.h>
|
|
|
|
#define AMD_BOOTLOC_BUG
|
|
-#define FORCE_WORD_WRITE 0
|
|
+#define FORCE_WORD_WRITE 1
|
|
|
|
#define MAX_WORD_RETRIES 3
|
|
|
|
@@ -54,7 +54,9 @@
|
|
|
|
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
|
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
|
+#if !FORCE_WORD_WRITE
|
|
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
|
+#endif
|
|
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
|
|
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
|
|
static void cfi_amdstd_sync (struct mtd_info *);
|
|
@@ -189,6 +191,7 @@ static void fixup_amd_bootblock(struct m
|
|
}
|
|
#endif
|
|
|
|
+#if !FORCE_WORD_WRITE
|
|
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
|
|
{
|
|
struct map_info *map = mtd->priv;
|
|
@@ -198,6 +201,7 @@ static void fixup_use_write_buffers(stru
|
|
mtd->write = cfi_amdstd_write_buffers;
|
|
}
|
|
}
|
|
+#endif /* !FORCE_WORD_WRITE */
|
|
|
|
/* Atmel chips don't use the same PRI format as AMD chips */
|
|
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
|
@@ -1343,6 +1347,7 @@ static int cfi_amdstd_write_words(struct
|
|
/*
|
|
* FIXME: interleaved mode not tested, and probably not supported!
|
|
*/
|
|
+#if !FORCE_WORD_WRITE
|
|
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
|
unsigned long adr, const u_char *buf,
|
|
int len)
|
|
@@ -1454,7 +1459,6 @@ static int __xipram do_write_buffer(stru
|
|
return ret;
|
|
}
|
|
|
|
-
|
|
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
|
size_t *retlen, const u_char *buf)
|
|
{
|
|
@@ -1533,6 +1537,7 @@ static int cfi_amdstd_write_buffers(stru
|
|
|
|
return 0;
|
|
}
|
|
+#endif /* !FORCE_WORD_WRITE */
|
|
|
|
/*
|
|
* Handle devices with one erase region, that only implement
|