diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2015-02-03 11:58:15 -0600 | 
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-03-30 23:24:39 -0500 | 
| commit | 073adf987e8251ad934fcac4fd1bf20d4f34f96e (patch) | |
| tree | 119c31a7837186ee411da308b04be28d511ad81a /drivers/mtd/nand/nand_base.c | |
| parent | 9ac71f112eb3cffc42e012fcdf5009e5b3b01a1d (diff) | |
nand: Remove CONFIG_MTD_NAND_VERIFY_WRITE
The CONFIG_MTD_NAND_VERIFY_WRITE has been removed from Linux for some
time and a more generic method of NAND verification now exists in U-Boot.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/mtd/nand/nand_base.c')
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 65 | 
1 files changed, 0 insertions, 65 deletions
| diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 6db6566e733..c0e381ad2d1 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -361,51 +361,6 @@ void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)  	ioread8_rep(chip->IO_ADDR_R, buf, len);  } -#ifdef __UBOOT__ -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) -/** - * nand_verify_buf - [DEFAULT] Verify chip data against buffer - * @mtd: MTD device structure - * @buf: buffer containing the data to compare - * @len: number of bytes to compare - * - * Default verify function for 8bit buswidth. - */ -static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len) -{ -	int i; -	struct nand_chip *chip = mtd->priv; - -	for (i = 0; i < len; i++) -		if (buf[i] != readb(chip->IO_ADDR_R)) -			return -EFAULT; -	return 0; -} - -/** - * nand_verify_buf16 - [DEFAULT] Verify chip data against buffer - * @mtd: MTD device structure - * @buf: buffer containing the data to compare - * @len: number of bytes to compare - * - * Default verify function for 16bit buswidth. - */ -static int nand_verify_buf16(struct mtd_info *mtd, const uint8_t *buf, int len) -{ -	int i; -	struct nand_chip *chip = mtd->priv; -	u16 *p = (u16 *) buf; -	len >>= 1; - -	for (i = 0; i < len; i++) -		if (p[i] != readw(chip->IO_ADDR_R)) -			return -EFAULT; - -	return 0; -} -#endif -#endif -  /**   * nand_write_buf16 - [DEFAULT] write buffer to chip   * @mtd: MTD device structure @@ -2435,20 +2390,6 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,  		status = chip->waitfunc(mtd, chip);  	} - -#ifdef __UBOOT__ -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) -	/* Send command to read back the data */ -	chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page); - -	if (chip->verify_buf(mtd, buf, mtd->writesize)) -		return -EIO; - -	/* Make sure the next page prog is preceded by a status read */ -	chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1); -#endif -#endif -  	return 0;  } @@ -3139,12 +3080,6 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)  		chip->read_buf = busw ? nand_read_buf16 : nand_read_buf;  	if (!chip->scan_bbt)  		chip->scan_bbt = nand_default_bbt; -#ifdef __UBOOT__ -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) -	if (!chip->verify_buf) -		chip->verify_buf = busw ? nand_verify_buf16 : nand_verify_buf; -#endif -#endif  	if (!chip->controller) {  		chip->controller = &chip->hwcontrol; | 
