diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 12:23:02 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-03-12 12:23:02 +0100 |
| commit | 7e492d8258182e31c988bbf9917d4a3d41949d56 (patch) | |
| tree | e9c9db79d797cf487107c019537c6bb00b854c6c /post/drivers/memory.c | |
| parent | afe45c87e3c5d77bad76b1a57dccd20764d45b5d (diff) | |
| parent | 30f1806f60978d707b0cff2d7bf89d141fc24290 (diff) | |
| download | u-boot-7e492d8258182e31c988bbf9917d4a3d41949d56.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'post/drivers/memory.c')
| -rw-r--r-- | post/drivers/memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/post/drivers/memory.c b/post/drivers/memory.c index fbc349a852..fb969856bc 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -186,7 +186,7 @@ DECLARE_GLOBAL_DATA_PTR; * * For other processors, let the compiler generate the best code it can. */ -static void move64(unsigned long long *src, unsigned long long *dest) +static void move64(const unsigned long long *src, unsigned long long *dest) { #if defined(CONFIG_MPC8260) || defined(CONFIG_MPC824X) asm ("lfd 0, 0(3)\n\t" /* fpr0 = *scr */ @@ -233,12 +233,12 @@ static int memory_post_dataline(unsigned long long * pmem) int ret = 0; for ( i = 0; i < num_patterns; i++) { - move64((unsigned long long *)&(pattern[i]), pmem++); + move64(&(pattern[i]), pmem++); /* * Put a different pattern on the data lines: otherwise they * may float long enough to read back what we wrote. */ - move64((unsigned long long *)&otherpattern, pmem--); + move64(&otherpattern, pmem--); move64(pmem, &temp64); #ifdef INJECT_DATA_ERRORS |