diff options
| author | Stefan Roese <sr@denx.de> | 2011-05-16 13:04:00 +0200 | 
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-05-16 14:10:19 -0500 | 
| commit | e29816f3307624e019ffb0f4dbdc2945b3042118 (patch) | |
| tree | 67175782452e0fdc5e59f2c038dda4238e4e78b3 /nand_spl/nand_boot.c | |
| parent | 535abb96fb665402894b820f934deaca61ce3d3e (diff) | |
| download | olio-uboot-2014.01-e29816f3307624e019ffb0f4dbdc2945b3042118.tar.xz olio-uboot-2014.01-e29816f3307624e019ffb0f4dbdc2945b3042118.zip | |
nand_spl: nand_boot.c: Remove last CONFIG_SYS_NAND_READ_DELAY occurance
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>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'nand_spl/nand_boot.c')
| -rw-r--r-- | nand_spl/nand_boot.c | 7 | 
1 files changed, 2 insertions, 5 deletions
| diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c index 00df2a04a..9545a9a7b 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); |