summaryrefslogtreecommitdiff
path: root/board/c2mon
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-10-29 23:18:55 +0000
committerwdenk <wdenk>2003-10-29 23:18:55 +0000
commit5fa66df63afe2841ce27596996811469903373a7 (patch)
treec57de575d2c6b4b1946caf9105ef44c20a3b074e /board/c2mon
parenta0f2fe524c63b3be90e18c89fc62673b1cf8fc6b (diff)
downloadu-boot-imx-5fa66df63afe2841ce27596996811469903373a7.zip
u-boot-imx-5fa66df63afe2841ce27596996811469903373a7.tar.gz
u-boot-imx-5fa66df63afe2841ce27596996811469903373a7.tar.bz2
* Prepare for release
* Fix problems in memory test on some boards (which was not non-destructive as intended) * Patch by Gary Jennejohn, 28 Oct 2003: Change fs/fat/fat.c to put I/O buffers in BSS instead on the stack to prevent stack overflow on ARM systems
Diffstat (limited to 'board/c2mon')
-rw-r--r--board/c2mon/c2mon.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/board/c2mon/c2mon.c b/board/c2mon/c2mon.c
index 171d06e..0fdcebe 100644
--- a/board/c2mon/c2mon.c
+++ b/board/c2mon/c2mon.c
@@ -228,8 +228,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;
- ulong save[32]; /* to make test non-destructive */
+ ulong cnt, val, size;
+ ulong save[32]; /* to make test non-destructive */
unsigned char i = 0;
memctl->memc_mamr = mamr_value;
@@ -248,7 +248,13 @@ static long int dram_size (long int mamr_value, long int *base,
/* 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);
}
@@ -259,7 +265,14 @@ static long int dram_size (long int mamr_value, long int *base,
*addr = save[--i];
if (val != (~cnt)) {
- return (cnt * sizeof (long));
+ 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);