Add a common get_ram_size() function and modify the the

board-specific files to invoke that common implementation.

1 files changed, 1 insertions, 46 deletions

diff --git a/board/c2mon/c2mon.c b/board/c2mon/c2mon.c
index 0fdcebe..873ff8c 100644
--- a/board/c2mon/c2mon.c
+++ b/board/c2mon/c2mon.c
@@ -227,53 +227,8 @@ static long int dram_size (long int mamr_value, long int *base,
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
 	volatile memctl8xx_t *memctl = &immap->im_memctl;
-	volatile long int *addr;
- 	ulong cnt, val, size;
- 	ulong save[32];			/* to make test non-destructive */
-	unsigned char i = 0;
 
 	memctl->memc_mamr = mamr_value;
 
-	for (cnt = maxsize / sizeof (long); cnt > 0; cnt >>= 1) {
-		addr = base + cnt;	/* pointer arith! */
-
-		save[i++] = *addr;
-		*addr = ~cnt;
-	}
-
-	/* write 0 to base address */
-	addr = base;
-	save[i] = *addr;
-	*addr = 0;
-
-	/* check at base address */
-	if ((val = *addr) != 0) {
-		/* Restore the original data before leaving the function.
-		 */
-		*addr = save[i];
-		for (cnt = 1; cnt <= maxsize / sizeof(long); cnt <<= 1) {
-			addr  = (volatile ulong *) base + cnt;
-			*addr = save[--i];
-		}
-		return (0);
-	}
-
-	for (cnt = 1; cnt <= maxsize / sizeof (long); cnt <<= 1) {
-		addr = base + cnt;	/* pointer arith! */
-
-		val = *addr;
-		*addr = save[--i];
-
-		if (val != (~cnt)) {
-			size = cnt * sizeof (long);
-			/* Restore the original data before returning
-			 */
-			for (cnt <<= 1; cnt <= maxsize / sizeof (long); cnt <<= 1) {
-				addr  = (volatile ulong *) base + cnt;
-				*addr = save[--i];
-			}
-			return (size);
-		}
-	}
-	return (maxsize);
+	return (get_ram_size(base, maxsize));
 }