Patchwork [U-Boot] nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance

login
register
mail settings
Submitter Stefan Roese
Date May 16, 2011, 11:04 a.m.
Message ID <1305543840-1257-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/95708/
State Accepted
Commit e29816f3307624e019ffb0f4dbdc2945b3042118
Headers show

Comments

Stefan Roese - May 16, 2011, 11:04 a.m.
Remove the last CONFIG_SYS_NAND_READ_DELAY occurance from nand_boot.c.
I missed this one in patch a9c847cb [nand_spl: nand_boot.c: Remove
CONFIG_SYS_NAND_READ_DELAY].

This fixes a compile breakage on kilauea_nand for example.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
---
 nand_spl/nand_boot.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
Scott Wood - May 16, 2011, 7:10 p.m.
On Mon, May 16, 2011 at 01:04:00PM +0200, Stefan Roese wrote:
> Remove the last CONFIG_SYS_NAND_READ_DELAY occurance from nand_boot.c.
> I missed this one in patch a9c847cb [nand_spl: nand_boot.c: Remove
> CONFIG_SYS_NAND_READ_DELAY].
> 
> This fixes a compile breakage on kilauea_nand for example.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
>  nand_spl/nand_boot.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)

Applied to u-boot-nand-flash

-Scott

Patch

diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c
index 00df2a0..9545a9a 100644
--- 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);