Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

* 'master' of git://git.denx.de/u-boot-nand-flash:
  nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance
This commit is contained in:
Wolfgang Denk 2011-05-18 14:30:31 +02:00
commit ce6400a0f8
1 changed files with 2 additions and 5 deletions

View File

@ -33,11 +33,8 @@ static int nand_command(struct mtd_info *mtd, int block, int page, int offs, u8
struct nand_chip *this = mtd->priv;
int page_addr = page + block * CONFIG_SYS_NAND_PAGE_COUNT;
if (this->dev_ready)
while (!this->dev_ready(mtd))
;
else
CONFIG_SYS_NAND_READ_DELAY;
while (!this->dev_ready(mtd))
;
/* Begin command latch cycle */
this->cmd_ctrl(mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);