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
14 years ago · ce6400a0f8
parent e09e083f7f e29816f330
commit ce6400a0f8
1 changed files with 2 additions and 5 deletions
--- a/nand_spl/nand_boot.c
+++ b/nand_spl/nand_boot.c
@ -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);