b5480de4d1
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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
|
|
@@ -40,7 +40,7 @@
|
|
#include <linux/mtd/xip.h>
|
|
|
|
#define AMD_BOOTLOC_BUG
|
|
-#define FORCE_WORD_WRITE 0
|
|
+#define FORCE_WORD_WRITE 1
|
|
|
|
#define MAX_RETRIES 3
|
|
|
|
@@ -51,7 +51,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 *);
|
|
@@ -202,6 +204,7 @@ static void fixup_amd_bootblock(struct m
|
|
}
|
|
#endif
|
|
|
|
+#if !FORCE_WORD_WRITE
|
|
static void fixup_use_write_buffers(struct mtd_info *mtd)
|
|
{
|
|
struct map_info *map = mtd->priv;
|
|
@@ -211,6 +214,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)
|
|
@@ -1798,6 +1802,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)
|
|
@@ -1926,7 +1931,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)
|
|
{
|
|
@@ -2001,6 +2005,7 @@ static int cfi_amdstd_write_buffers(stru
|
|
|
|
return 0;
|
|
}
|
|
+#endif /* !FORCE_WORD_WRITE */
|
|
|
|
/*
|
|
* Wait for the flash chip to become ready to write data
|