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 git://git.denx.de/u-boot-usb
[oweals/u-boot.git]
/
drivers
/
mtd
/
nand
/
fsl_upm.c
diff --git
a/drivers/mtd/nand/fsl_upm.c
b/drivers/mtd/nand/fsl_upm.c
index 3ae0044f26e8ba42bbb429cc542e68a2e9fa4a45..65ce98ad5e332b8704344c990fa21e7da4d6827e 100644
(file)
--- a/
drivers/mtd/nand/fsl_upm.c
+++ b/
drivers/mtd/nand/fsl_upm.c
@@
-153,6
+153,7
@@
static void upm_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
buf[i] = in_8(chip->IO_ADDR_R);
}
buf[i] = in_8(chip->IO_ADDR_R);
}
+#if defined(CONFIG_MTD_NAND_VERIFY_WRITE)
static int upm_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
{
int i;
static int upm_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
{
int i;
@@
-165,6
+166,7
@@
static int upm_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
return 0;
}
return 0;
}
+#endif
static int nand_dev_ready(struct mtd_info *mtd)
{
static int nand_dev_ready(struct mtd_info *mtd)
{
@@
-191,7
+193,9
@@
int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun)
chip->read_byte = upm_nand_read_byte;
chip->read_buf = upm_nand_read_buf;
chip->write_buf = upm_nand_write_buf;
chip->read_byte = upm_nand_read_byte;
chip->read_buf = upm_nand_read_buf;
chip->write_buf = upm_nand_write_buf;
+#if defined(CONFIG_MTD_NAND_VERIFY_WRITE)
chip->verify_buf = upm_nand_verify_buf;
chip->verify_buf = upm_nand_verify_buf;
+#endif
if (fun->dev_ready)
chip->dev_ready = nand_dev_ready;
if (fun->dev_ready)
chip->dev_ready = nand_dev_ready;