* Prepare for release

[karo-tx-uboot.git] / board / etx094 / etx094.c

diff --git a/board/etx094/etx094.c b/board/etx094/etx094.c
index d48772be6c3e947b0926a37f2c0eb657baab0ae5..e52ca85741354e85a879bd4b262cfdc6571adbd3 100644 (file)
--- a/board/etx094/etx094.c
+++ b/board/etx094/etx094.c
@@ -321,8 +321,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;
@@ -341,7 +341,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);
        }
 
@@ -352,7 +358,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);