Add a common get_ram_size() function and modify the the

[people/ms/u-boot.git] / board / sandpoint / sandpoint.c

diff --git a/board/sandpoint/sandpoint.c b/board/sandpoint/sandpoint.c
index fe1c0a0d5eb4613e8e03664a58b66c5281693675..d3445bd92d9efdb443e524e94aa2f7cb001fce4c 100644 (file)
--- a/board/sandpoint/sandpoint.c
+++ b/board/sandpoint/sandpoint.c
@@ -52,50 +52,24 @@ int checkflash (void)
 
 long int initdram (int board_type)
 {
-       int              i, cnt;
-       volatile uchar * base= CFG_SDRAM_BASE;
-       volatile ulong * addr;
-       ulong            save[32];
-       ulong            val, ret  = 0;
+       long size;
+       long new_bank0_end;
+       long mear1;
+       long emear1;
 
-       for (i=0, cnt=(CFG_MAX_RAM_SIZE / sizeof(long)) >> 1; cnt > 0; cnt >>= 1) {
-               addr = (volatile ulong *)base + cnt;
-               save[i++] = *addr;
-               *addr = ~cnt;
-       }
+       size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE);
 
-       addr = (volatile ulong *)base;
-       save[i] = *addr;
-       *addr = 0;
+       new_bank0_end = size - 1;
+       mear1 = mpc824x_mpc107_getreg(MEAR1);
+       emear1 = mpc824x_mpc107_getreg(EMEAR1);
+       mear1 = (mear1  & 0xFFFFFF00) |
+               ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT);
+       emear1 = (emear1 & 0xFFFFFF00) |
+               ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT);
+       mpc824x_mpc107_setreg(MEAR1, mear1);
+       mpc824x_mpc107_setreg(EMEAR1, emear1);
 
-       if (*addr != 0) {
-               *addr = save[i];
-               goto Done;
-       }
-
-       for (cnt = 1; cnt <= CFG_MAX_RAM_SIZE / sizeof(long); cnt <<= 1) {
-               addr = (volatile ulong *)base + cnt;
-               val = *addr;
-               *addr = save[--i];
-               if (val != ~cnt) {
-                       ulong new_bank0_end = cnt * sizeof(long) - 1;
-                       ulong mear1  = mpc824x_mpc107_getreg(MEAR1);
-                       ulong emear1 = mpc824x_mpc107_getreg(EMEAR1);
-                       mear1 =  (mear1  & 0xFFFFFF00) |
-                       ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT);
-                       emear1 = (emear1 & 0xFFFFFF00) |
-                       ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT);
-                       mpc824x_mpc107_setreg(MEAR1,  mear1);
-                       mpc824x_mpc107_setreg(EMEAR1, emear1);
-
-                       ret = cnt * sizeof(long);
-                       goto Done;
-               }
-       }
-
-       ret = CFG_MAX_RAM_SIZE;
-Done:
-       return ret;
+       return (size);
 }
 
 /*