projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
drivers
/
mtd
/
nand
/
nand_base.c
diff --git
a/drivers/mtd/nand/nand_base.c
b/drivers/mtd/nand/nand_base.c
index 4cf45189896c6004761a877e08944ab375a9784d..b025001337e1fd0c8806461753e699a9d06a4aad 100644
(file)
--- a/
drivers/mtd/nand/nand_base.c
+++ b/
drivers/mtd/nand/nand_base.c
@@
-44,7
+44,7
@@
#include <linux/mtd/partitions.h>
#endif
#include <asm/io.h>
#include <linux/mtd/partitions.h>
#endif
#include <asm/io.h>
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
/* Define default oob placement schemes for large and small page devices */
static struct nand_ecclayout nand_oob_8 = {
/* Define default oob placement schemes for large and small page devices */
static struct nand_ecclayout nand_oob_8 = {
@@
-241,7
+241,6
@@
static void nand_write_byte16(struct mtd_info *mtd, uint8_t byte)
chip->write_buf(mtd, (uint8_t *)&word, 2);
}
chip->write_buf(mtd, (uint8_t *)&word, 2);
}
-#if !defined(CONFIG_BLACKFIN)
static void iowrite8_rep(void *addr, const uint8_t *buf, int len)
{
int i;
static void iowrite8_rep(void *addr, const uint8_t *buf, int len)
{
int i;
@@
-274,7
+273,6
@@
static void iowrite16_rep(void *addr, void *buf, int len)
for (i = 0; i < len; i++)
writew(p[i], addr);
}
for (i = 0; i < len; i++)
writew(p[i], addr);
}
-#endif
/**
* nand_write_buf - [DEFAULT] write buffer to chip
/**
* nand_write_buf - [DEFAULT] write buffer to chip
@@
-2414,7
+2412,7
@@
static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
int cached = writelen > bytes && page != blockmask;
uint8_t *wbuf = buf;
int use_bufpoi;
int cached = writelen > bytes && page != blockmask;
uint8_t *wbuf = buf;
int use_bufpoi;
- int part_pagewr = (column || writelen <
(mtd->writesize - 1)
);
+ int part_pagewr = (column || writelen <
mtd->writesize
);
if (part_pagewr)
use_bufpoi = 1;
if (part_pagewr)
use_bufpoi = 1;