Merge with git://www.denx.de/git/u-boot.git

[u-boot] / board / iphase4539 / iphase4539.c

diff --git a/board/iphase4539/iphase4539.c b/board/iphase4539/iphase4539.c
index 45f3dad36adfc4c9276b103ded814d6c36448621..0ca9cf5137eac4e1c0a91736f12273fb4c6c8bdc 100644 (file)
--- a/board/iphase4539/iphase4539.c
+++ b/board/iphase4539/iphase4539.c
@@ -198,9 +198,8 @@ long int initdram (int board_type)
        volatile immap_t *immap = (immap_t *) CFG_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
        volatile uchar *base;
-       volatile ulong *addr, cnt, val;
-       ulong save[32];                         /* to make test non-destructive */
-       int i, maxsize;
+       ulong maxsize;
+       int i;
 
        memctl->memc_psrt = CFG_PSRT;
        memctl->memc_mptpr = CFG_MPTPR;
@@ -237,43 +236,10 @@ long int initdram (int board_type)
         */
        maxsize = (1 + (~memctl->memc_or1 | 0x7fff)) / 2;
 
-       /*
-        * Check memory range for valid RAM. A simple memory test determines
-        * the actually available RAM size between addresses `base' and
-        * `base + maxsize'. Some (not all) hardware errors are detected:
-        * - short between address lines
-        * - short between data lines
-        */
-       i = 0;
-       for (cnt = maxsize / sizeof (long); cnt > 0; cnt >>= 1) {
-               addr = (volatile ulong *) base + cnt;   /* pointer arith! */
-               save[i++] = *addr;
-               *addr = ~cnt;
-       }
+       maxsize = get_ram_size((long *)base, maxsize);
 
-       addr = (volatile ulong *) base;
-       save[i] = *addr;
-       *addr = 0;
-
-       if ((val = *addr) != 0) {
-               *addr = save[i];
-               return (0);
-       }
-
-       for (cnt = 1; cnt <= maxsize / sizeof (long); cnt <<= 1) {
-               addr = (volatile ulong *) base + cnt;   /* pointer arith! */
-               val = *addr;
-               *addr = save[--i];
-               if (val != ~cnt) {
-                       /* Write the actual size to ORx
-                        */
-                       memctl->memc_or1 |= ~(cnt * sizeof (long) - 1);
-                       maxsize = cnt * sizeof (long) / 2;
-                       break;
-               }
-       }
+       memctl->memc_or1 |= ~(maxsize - 1);
 
-       maxsize *= 2;
        if (maxsize != hwc_main_sdram_size ())
                printf ("Oops: memory test has not found all memory!\n");
 #endif
@@ -376,7 +342,7 @@ int hwc_serial_number (void)
 {
        int sn = -1;
 
-       if (!seeprom_read (0xa0, (char *) &sn, sizeof (sn))) {
+       if (!seeprom_read (0xa0, (uchar *) &sn, sizeof (sn))) {
                sn = cpu_to_le32 (sn);
        }
        return sn;
@@ -385,7 +351,7 @@ int hwc_mac_address (char *str)
 {
        char mac[6];
 
-       if (!seeprom_read (0xb0, mac, sizeof (mac))) {
+       if (!seeprom_read (0xb0, (uchar *)mac, sizeof (mac))) {
                sprintf (str, "%02x:%02x:%02x:%02x:%02x:%02x\n",
                                 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
        } else {