diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-10 20:38:35 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-10 20:38:35 +0200 |
| commit | f2c459ce6eab51fd96ef68cde0290be6b500e8d6 (patch) | |
| tree | 6044820041f20df928c382ef9c90331c7ffbd479 | |
| parent | c2c0ab4aff86622b837a48a0e560351f9afafb95 (diff) | |
| parent | 3a82d5915498fe1c347de38d30323853e54f50df (diff) | |
| download | blackbird-obmc-uboot-f2c459ce6eab51fd96ef68cde0290be6b500e8d6.tar.gz blackbird-obmc-uboot-f2c459ce6eab51fd96ef68cde0290be6b500e8d6.zip | |
Merge with git+ssh://sr@pollux.denx.org/home/wd/git/u-boot/from_stefan
| -rw-r--r-- | drivers/nand/nand_util.c | 21 | ||||
| -rw-r--r-- | include/div64.h (renamed from include/asm-avr32/div64.h) | 0 | ||||
| -rw-r--r-- | lib_avr32/Makefile | 2 | ||||
| -rw-r--r-- | lib_generic/Makefile | 2 | ||||
| -rw-r--r-- | lib_generic/div64.c (renamed from lib_avr32/div64.c) | 2 |
5 files changed, 12 insertions, 15 deletions
diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c index 88c1df6c20..aee8727039 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 diff --git a/include/asm-avr32/div64.h b/include/div64.h index 2e0ba8389e..2e0ba8389e 100644 --- a/include/asm-avr32/div64.h +++ b/include/div64.h diff --git a/lib_avr32/Makefile b/lib_avr32/Makefile index cf20836023..bb2938fe5c 100644 --- a/lib_avr32/Makefile +++ b/lib_avr32/Makefile @@ -29,7 +29,7 @@ LIB = $(obj)lib$(ARCH).a SOBJS = memset.o -COBJS = board.o interrupts.o avr32_linux.o div64.o +COBJS = board.o interrupts.o avr32_linux.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/lib_generic/Makefile b/lib_generic/Makefile index b2091c5e78..bf377529c2 100644 --- a/lib_generic/Makefile +++ b/lib_generic/Makefile @@ -27,7 +27,7 @@ LIB = $(obj)libgeneric.a COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o \ - crc32.o ctype.o display_options.o ldiv.o sha1.o \ + crc32.o ctype.o display_options.o div64.o ldiv.o sha1.o \ string.o vsprintf.o zlib.o SRCS := $(COBJS:.o=.c) diff --git a/lib_avr32/div64.c b/lib_generic/div64.c index 99726e325d..d9951b597f 100644 --- a/lib_avr32/div64.c +++ b/lib_generic/div64.c @@ -18,8 +18,6 @@ #include <linux/types.h> -#include <asm/div64.h> - uint32_t __div64_32(uint64_t *n, uint32_t base) { uint64_t rem = *n; |
