mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-21 01:18:52 +09:00
Merge with git+ssh://sr@pollux.denx.org/home/wd/git/u-boot/from_stefan
This commit is contained in:
commit
f2c459ce6e
@ -37,6 +37,7 @@
|
|||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <watchdog.h>
|
#include <watchdog.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
#include <div64.h>
|
||||||
|
|
||||||
#include <nand.h>
|
#include <nand.h>
|
||||||
#include <jffs2/jffs2.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) {
|
if (!opts->quiet) {
|
||||||
int percent = (int)
|
unsigned long long n =(unsigned long long)
|
||||||
((unsigned long long)
|
|
||||||
(erase.addr+meminfo->erasesize-opts->offset)
|
(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
|
/* output progress message only at whole percent
|
||||||
* steps to reduce the number of messages printed
|
* 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;
|
imglen -= readlen;
|
||||||
|
|
||||||
if (!opts->quiet) {
|
if (!opts->quiet) {
|
||||||
int percent = (int)
|
unsigned long long n = (unsigned long long)
|
||||||
((unsigned long long)
|
(opts->length-imglen) * 100;
|
||||||
(opts->length-imglen) * 100
|
int percent = (int)do_div(n, opts->length);
|
||||||
/ opts->length);
|
|
||||||
/* output progress message only at whole percent
|
/* output progress message only at whole percent
|
||||||
* steps to reduce the number of messages printed
|
* steps to reduce the number of messages printed
|
||||||
* on (slow) serial consoles
|
* 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) {
|
if (!opts->quiet) {
|
||||||
int percent = (int)
|
unsigned long long n = (unsigned long long)
|
||||||
((unsigned long long)
|
(opts->length-imglen) * 100;
|
||||||
(opts->length-imglen) * 100
|
int percent = (int)do_div(n ,opts->length);
|
||||||
/ opts->length);
|
|
||||||
/* output progress message only at whole percent
|
/* output progress message only at whole percent
|
||||||
* steps to reduce the number of messages printed
|
* steps to reduce the number of messages printed
|
||||||
* on (slow) serial consoles
|
* on (slow) serial consoles
|
||||||
|
@ -29,7 +29,7 @@ LIB = $(obj)lib$(ARCH).a
|
|||||||
|
|
||||||
SOBJS = memset.o
|
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)
|
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
||||||
|
@ -27,7 +27,7 @@ LIB = $(obj)libgeneric.a
|
|||||||
|
|
||||||
COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \
|
COBJS = bzlib.o bzlib_crctable.o bzlib_decompress.o \
|
||||||
bzlib_randtable.o bzlib_huffman.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
|
string.o vsprintf.o zlib.o
|
||||||
|
|
||||||
SRCS := $(COBJS:.o=.c)
|
SRCS := $(COBJS:.o=.c)
|
||||||
|
@ -18,8 +18,6 @@
|
|||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
|
||||||
#include <asm/div64.h>
|
|
||||||
|
|
||||||
uint32_t __div64_32(uint64_t *n, uint32_t base)
|
uint32_t __div64_32(uint64_t *n, uint32_t base)
|
||||||
{
|
{
|
||||||
uint64_t rem = *n;
|
uint64_t rem = *n;
|
Loading…
Reference in New Issue
Block a user