diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-31 17:17:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-31 17:17:06 -0400 |
| commit | 482cbd553daf3d9cd21e564702bac84a6bd43f2f (patch) | |
| tree | ba0c09e8301e7fae94072408e4d6f4254b2d238f /board | |
| parent | 9da7e3daf31d7c0c8478a57544bfdd6245e53ff3 (diff) | |
| parent | 55765b1842e7dcf22efa8d973c7d1b7498dd99fa (diff) | |
| download | talos-obmc-uboot-482cbd553daf3d9cd21e564702bac84a6bd43f2f.tar.gz talos-obmc-uboot-482cbd553daf3d9cd21e564702bac84a6bd43f2f.zip | |
Merge git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board')
| -rw-r--r-- | board/prodrive/alpr/nand.c | 16 | ||||
| -rw-r--r-- | board/socrates/nand.c | 25 |
2 files changed, 0 insertions, 41 deletions
diff --git a/board/prodrive/alpr/nand.c b/board/prodrive/alpr/nand.c index 5427de5634..ca40cea9ad 100644 --- a/board/prodrive/alpr/nand.c +++ b/board/prodrive/alpr/nand.c @@ -93,19 +93,6 @@ static void alpr_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) } } -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) -static int alpr_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) -{ - int i; - - for (i = 0; i < len; i++) - if (buf[i] != readb(&(alpr_ndfc->data))) - return i; - - return 0; -} -#endif - static int alpr_nand_dev_ready(struct mtd_info *mtd) { /* @@ -130,9 +117,6 @@ int board_nand_init(struct nand_chip *nand) nand->read_byte = alpr_nand_read_byte; nand->write_buf = alpr_nand_write_buf; nand->read_buf = alpr_nand_read_buf; -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) - nand->verify_buf = alpr_nand_verify_buf; -#endif nand->dev_ready = alpr_nand_dev_ready; return 0; diff --git a/board/socrates/nand.c b/board/socrates/nand.c index 73944780bf..15e6ea6944 100644 --- a/board/socrates/nand.c +++ b/board/socrates/nand.c @@ -18,9 +18,6 @@ static void sc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len); static u_char sc_nand_read_byte(struct mtd_info *mtd); static u16 sc_nand_read_word(struct mtd_info *mtd); static void sc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len); -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) -static int sc_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len); -#endif static int sc_nand_device_ready(struct mtd_info *mtdinfo); #define FPGA_NAND_CMD_MASK (0x7 << 28) @@ -102,25 +99,6 @@ static void sc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len) } } -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) -/** - * sc_nand_verify_buf - Verify chip data against buffer - * @mtd: MTD device structure - * @buf: buffer containing the data to compare - * @len: number of bytes to compare - */ -static int sc_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) -{ - int i; - - for (i = 0; i < len; i++) { - if (buf[i] != sc_nand_read_byte(mtd)); - return -EFAULT; - } - return 0; -} -#endif - /** * sc_nand_device_ready - Check the NAND device is ready for next command. * @mtd: MTD device structure @@ -178,9 +156,6 @@ int board_nand_init(struct nand_chip *nand) nand->read_word = sc_nand_read_word; nand->write_buf = sc_nand_write_buf; nand->read_buf = sc_nand_read_buf; -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) - nand->verify_buf = sc_nand_verify_buf; -#endif return 0; } |
