Merge with /home/sr/git/u-boot/nand-timeout

diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c
index b7a5d32..8237f4a 100644 (file)
--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@@ -838,9 +838,9 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
        unsigned long   timeo;
 
        if (state == FL_ERASING)
-               timeo = CFG_HZ * 400;
+               timeo += (HZ * 400) / 1000;
        else
-               timeo = CFG_HZ * 20;
+               timeo += (HZ * 20) / 1000;
 
        if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
                this->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);
@@ -852,8 +852,8 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
        while (1) {
                if (get_timer(0) > timeo) {
                        printf("Timeout!");
-                       return 0;
-                       }
+                       return 0x01;
+               }
 
                if (this->dev_ready) {
                        if (this->dev_ready(mtd))