diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-05-18 14:30:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-05-18 14:30:31 +0200 |
| commit | ce6400a0f88f9648d6def519244ea8c33c7612b2 (patch) | |
| tree | 175cba76cc9ee4b6557ddf6b00a79949005548ec | |
| parent | e09e083f7ff1b0140c5d5a2bdc29902b7b23ffba (diff) | |
| parent | e29816f3307624e019ffb0f4dbdc2945b3042118 (diff) | |
| download | u-boot-imx-ce6400a0f88f9648d6def519244ea8c33c7612b2.zip u-boot-imx-ce6400a0f88f9648d6def519244ea8c33c7612b2.tar.gz u-boot-imx-ce6400a0f88f9648d6def519244ea8c33c7612b2.tar.bz2 | |
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
| -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 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); |