diff options
| author | Stefan Roese <sr@denx.de> | 2011-05-04 11:44:14 +0200 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2011-05-13 11:13:21 -0500 |
| commit | a9c847cb38991a557c767fd02a71bd5fbdd25a95 (patch) | |
| tree | cb26077201a5a9e1f297298db90f42f5289864cb | |
| parent | a89a990159d450765b8a5675e640525bc6258d1b (diff) | |
| download | u-boot-a9c847cb38991a557c767fd02a71bd5fbdd25a95.tar.gz u-boot-a9c847cb38991a557c767fd02a71bd5fbdd25a95.tar.xz u-boot-a9c847cb38991a557c767fd02a71bd5fbdd25a95.zip | |
nand_spl: nand_boot.c: Remove CONFIG_SYS_NAND_READ_DELAY
There are multiple reasons why this define should be removed:
First it saves some space and therefore fixes a problem we have on
the canyonlands_nand and glacier_nand targets right now.
Second, the define was hackish and would most likely not work on all
board using nand_boot.c. Boards not providing a real dev_ready()
function should implement a board specific function instead.
I checked and it seems, that all boards using nand_boot.c right now
already implement a board specific dev_ready() function. So this
patch should not break any boards and will result in smaller
NAND_SPL images.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Sughosh Ganu <urwithsughosh@gmail.com>
Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Tested-by: Sughosh Ganu <urwithsughosh@gmail.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | nand_spl/nand_boot.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c index 06c6f6de77..00df2a04ac 100644 --- a/nand_spl/nand_boot.c +++ b/nand_spl/nand_boot.c @@ -22,9 +22,6 @@ #include <nand.h> #include <asm/io.h> -#define CONFIG_SYS_NAND_READ_DELAY \ - { volatile int dummy; int i; for (i=0; i<10000; i++) dummy = i; } - static int nand_ecc_pos[] = CONFIG_SYS_NAND_ECCPOS; #if (CONFIG_SYS_NAND_PAGE_SIZE <= 512) @@ -61,11 +58,8 @@ static int nand_command(struct mtd_info *mtd, int block, int page, int offs, u8 /* * Wait a while for the data to be ready */ - if (this->dev_ready) - while (!this->dev_ready(mtd)) - ; - else - CONFIG_SYS_NAND_READ_DELAY; + while (!this->dev_ready(mtd)) + ; return 0; } @@ -80,11 +74,8 @@ static int nand_command(struct mtd_info *mtd, int block, int page, int offs, u8 void (*hwctrl)(struct mtd_info *mtd, int cmd, unsigned int ctrl) = this->cmd_ctrl; - if (this->dev_ready) - while (!this->dev_ready(mtd)) - ; - else - CONFIG_SYS_NAND_READ_DELAY; + while (!this->dev_ready(mtd)) + ; /* Emulate NAND_CMD_READOOB */ if (cmd == NAND_CMD_READOOB) { @@ -120,11 +111,8 @@ static int nand_command(struct mtd_info *mtd, int block, int page, int offs, u8 /* * Wait a while for the data to be ready */ - if (this->dev_ready) - while (!this->dev_ready(mtd)) - ; - else - CONFIG_SYS_NAND_READ_DELAY; + while (!this->dev_ready(mtd)) + ; return 0; } |