summaryrefslogtreecommitdiff
path: root/board/siemens/SCM/scm.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-01-06 22:38:14 +0000
committerwdenk <wdenk>2004-01-06 22:38:14 +0000
commitc83bf6a2d00ef846c1fb2b0c60540f03ef203125 (patch)
treee410334c86d491dbbec765a5765eef9cccd3135a /board/siemens/SCM/scm.c
parentb299e41a0d34bf96202d9bbb72739bdd9414b0cc (diff)
downloadu-boot-imx-c83bf6a2d00ef846c1fb2b0c60540f03ef203125.zip
u-boot-imx-c83bf6a2d00ef846c1fb2b0c60540f03ef203125.tar.gz
u-boot-imx-c83bf6a2d00ef846c1fb2b0c60540f03ef203125.tar.bz2
Add a common get_ram_size() function and modify the the
board-specific files to invoke that common implementation.
Diffstat (limited to 'board/siemens/SCM/scm.c')
-rw-r--r--board/siemens/SCM/scm.c41
1 files changed, 4 insertions, 37 deletions
diff --git a/board/siemens/SCM/scm.c b/board/siemens/SCM/scm.c
index 9467b1f..d832edf 100644
--- a/board/siemens/SCM/scm.c
+++ b/board/siemens/SCM/scm.c
@@ -235,13 +235,10 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
ulong orx, volatile uchar * base)
{
volatile uchar c = 0xff;
- ulong cnt, val;
- volatile ulong *addr;
volatile uint *sdmr_ptr;
volatile uint *orx_ptr;
+ ulong maxsize, size;
int i;
- ulong save[32]; /* to make test non-destructive */
- ulong maxsize;
/* We must be able to test a location outsize the maximum legal size
* to find out THAT we are outside; but this address still has to be
@@ -291,41 +288,11 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
- /*
- * Check memory range for valid RAM. A simple memory test determines
- * the actually available RAM size between addresses `base' and
- * `base + maxsize'. Some (not all) hardware errors are detected:
- * - short between address lines
- * - short between data lines
- */
- i = 0;
- for (cnt = maxsize / sizeof (long); cnt > 0; cnt >>= 1) {
- addr = (volatile ulong *) base + cnt; /* pointer arith! */
- save[i++] = *addr;
- *addr = ~cnt;
- }
+ size = get_ram_size((long *)base, maxsize);
- addr = (volatile ulong *) base;
- save[i] = *addr;
- *addr = 0;
+ *orx_ptr = orx | ~(size - 1);
- if ((val = *addr) != 0) {
- *addr = save[i];
- return (0);
- }
-
- for (cnt = 1; cnt <= maxsize / sizeof (long); cnt <<= 1) {
- addr = (volatile ulong *) base + cnt; /* pointer arith! */
- val = *addr;
- *addr = save[--i];
- if (val != ~cnt) {
- /* Write the actual size to ORx
- */
- *orx_ptr = orx | ~(cnt * sizeof (long) - 1);
- return (cnt * sizeof (long));
- }
- }
- return (maxsize);
+ return (size);
}
/*