summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-08-10 10:35:10 +0200
committerWolfgang Denk <wd@denx.de>2007-08-10 10:35:10 +0200
commit3a82d5915498fe1c347de38d30323853e54f50df (patch)
tree1a7fb24fb521429dc015ddc1f6c02da6331368f2 /drivers
parent99c2fdab91bc633e46fb41dbaa629f87ccf6e00f (diff)
parent545359dd277a0a998c2c1ef9f8338081a56ccaba (diff)
downloadu-boot-imx-3a82d5915498fe1c347de38d30323853e54f50df.zip
u-boot-imx-3a82d5915498fe1c347de38d30323853e54f50df.tar.gz
u-boot-imx-3a82d5915498fe1c347de38d30323853e54f50df.tar.bz2
Merge with git+ssh://atlas/home/wd/git/u-boot/master
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nand/nand_util.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c
index 88c1df6..aee8727 100644
--- a/drivers/nand/nand_util.c
+++ b/drivers/nand/nand_util.c
@@ -37,6 +37,7 @@
#include <command.h>
#include <watchdog.h>
#include <malloc.h>
+#include <div64.h>
#include <nand.h>
#include <jffs2/jffs2.h>
@@ -208,10 +209,10 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
}
if (!opts->quiet) {
- int percent = (int)
- ((unsigned long long)
+ unsigned long long n =(unsigned long long)
(erase.addr+meminfo->erasesize-opts->offset)
- * 100 / erase_length);
+ * 100;
+ int percent = (int)do_div(n, erase_length);
/* output progress message only at whole percent
* steps to reduce the number of messages printed
@@ -475,10 +476,9 @@ int nand_write_opts(nand_info_t *meminfo, const nand_write_options_t *opts)
imglen -= readlen;
if (!opts->quiet) {
- int percent = (int)
- ((unsigned long long)
- (opts->length-imglen) * 100
- / opts->length);
+ unsigned long long n = (unsigned long long)
+ (opts->length-imglen) * 100;
+ int percent = (int)do_div(n, opts->length);
/* output progress message only at whole percent
* steps to reduce the number of messages printed
* on (slow) serial consoles
@@ -651,10 +651,9 @@ int nand_read_opts(nand_info_t *meminfo, const nand_read_options_t *opts)
}
if (!opts->quiet) {
- int percent = (int)
- ((unsigned long long)
- (opts->length-imglen) * 100
- / opts->length);
+ unsigned long long n = (unsigned long long)
+ (opts->length-imglen) * 100;
+ int percent = (int)do_div(n ,opts->length);
/* output progress message only at whole percent
* steps to reduce the number of messages printed
* on (slow) serial consoles