* 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
diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c
index 53f1f2a..badc794 100644
--- a/board/tqm8xx/tqm8xx.c
+++ b/board/tqm8xx/tqm8xx.c
@@ -389,8 +389,8 @@
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;
@@ -409,7 +409,13 @@
/* 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);
}
@@ -420,7 +426,14 @@
*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);