redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

Revert "common/memsize.c: Simplify RAM size detection" 

This commit breaks bootup on sunxi boards, the get stuck
when running the main u-boot binary at:

CPU:   Allwinner H3 (SUN8I)
I2C:   ready
DRAM:

This reverts commit 8e7cba048b.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
utp
Hans de Goede 2016-02-09 22:38:31 +01:00 committed by Tom Rini
parent c82ce04a3f
commit cc8d698fab
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/memsize.c
View File

@ -33,28 +33,38 @@ long get_ram_size(long *base, long maxsize)
long size; long size;
int i = 0; int i = 0;
for (cnt = (maxsize / sizeof(long)) >> 1; cnt >= 0; cnt >>= 1) { for (cnt = (maxsize / sizeof(long)) >> 1; cnt > 0; cnt >>= 1) {
addr = base + cnt; /* pointer arith! */ addr = base + cnt; /* pointer arith! */
sync(); sync();
save[i] = *addr; save[i++] = *addr;
sync(); sync();
if (cnt) { *addr = ~cnt;
i++;
*addr = ~cnt;
} else {
*addr = 0;
}
} }
addr = base;
sync(); sync();
cnt = 0; save[i] = *addr;
do { sync();
*addr = 0;
sync();
if ((val = *addr) != 0) {
/* Restore the original data before leaving the function. */
sync();
*addr = save[i];
for (cnt = 1; cnt < maxsize / sizeof(long); cnt <<= 1) {
addr = base + cnt;
sync();
*addr = save[--i];
}
return (0);
}
for (cnt = 1; cnt < maxsize / sizeof(long); cnt <<= 1) {
addr = base + cnt; /* pointer arith! */ addr = base + cnt; /* pointer arith! */
val = *addr; val = *addr;
*addr = save[i--]; *addr = save[--i];
sync(); if (val != ~cnt) {
if (((cnt == 0) && (val != 0)) ||
((cnt != 0) && (val != ~cnt))) {
size = cnt * sizeof(long); size = cnt * sizeof(long);
/* /*
* Restore the original data * Restore the original data
@ -64,16 +74,11 @@ long get_ram_size(long *base, long maxsize)
cnt < maxsize / sizeof(long); cnt < maxsize / sizeof(long);
cnt <<= 1) { cnt <<= 1) {
addr = base + cnt; addr = base + cnt;
*addr = save[i--]; *addr = save[--i];
} }
return (size); return (size);
} }
}
if (cnt)
cnt = cnt << 1;
else
cnt = 1;
} while (cnt < maxsize / sizeof(long));
return (maxsize); return (maxsize);
} }