* Patch by Matthew S. McClintock, 14 Apr 2004:

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

diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c
index 4d2100b4d6dd779b66be33394545482cb9eb9df3..5b12a0c04c2abe84e192621f145784578baec10c 100644 (file)
--- a/board/RPXClassic/RPXClassic.c
+++ b/board/RPXClassic/RPXClassic.c
@@ -127,12 +127,12 @@ void board_get_enetaddr (uchar * enet)
                        }
                }
                /* Scan to the end of the record                */
-               while ((*cp != '\n') && (*cp != 0xff)) {
+               while ((*cp != '\n') && (*cp != (char)0xff)) {
                        cp++;
                }
                /* If the next character is a \n, 0 or ff, we are done. */
                cp++;
-               if ((*cp == '\n') || (*cp == 0) || (*cp == 0xff))
+               if ((*cp == '\n') || (*cp == 0) || (*cp == (char)0xff))
                        break;
        }
 
@@ -140,12 +140,6 @@ void board_get_enetaddr (uchar * enet)
        /* The MAC address is the same as normal ethernet except the 3rd byte    */
        /* (See the E.P. Planet Core Overview manual            */
        enet[3] |= 0x80;
-
-       /* Validate the fast ethernet tranceiver                */
-       *((volatile uchar *) BCSR2) &= ~BCSR2_MIICTL;
-       *((volatile uchar *) BCSR2) &= ~BCSR2_MIIPWRDWN;
-       *((volatile uchar *) BCSR2) |= BCSR2_MIIRST;
-       *((volatile uchar *) BCSR2) |= BCSR2_MIIPWRDWN;
 #endif
 
        printf ("MAC address = %02x:%02x:%02x:%02x:%02x:%02x\n",
@@ -158,6 +152,15 @@ void rpxclassic_init (void)
        /* Enable NVRAM */
        *((uchar *) BCSR0) |= BCSR0_ENNVRAM;
 
+#ifdef CONFIG_FEC_ENET
+
+       /* Validate the fast ethernet tranceiver                             */
+       *((volatile uchar *) BCSR2) &= ~BCSR2_MIICTL;
+       *((volatile uchar *) BCSR2) &= ~BCSR2_MIIPWRDWN;
+       *((volatile uchar *) BCSR2) |= BCSR2_MIIRST;
+       *((volatile uchar *) BCSR2) |= BCSR2_MIIPWRDWN;
+#endif
+
 }
 
 /* ------------------------------------------------------------------------- */
@@ -217,43 +220,15 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
 {
        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 */
-       unsigned char i = 0;
 
        memctl->memc_mamr = mamr_value;
 
-       for (cnt = maxsize / sizeof (long); cnt > 0; cnt >>= 1) {
-               addr = base + cnt;      /* pointer arith! */
-
-               save[i++] = *addr;
-               *addr = ~cnt;
-       }
-
-       /* write 0 to base address */
-       addr = base;
-       save[i] = *addr;
-       *addr = 0;
-
-       /* check at base address */
-       if ((val = *addr) != 0) {
-               *addr = save[i];
-               return (0);
-       }
-
-       for (cnt = 1; cnt <= maxsize / sizeof (long); cnt <<= 1) {
-               addr = base + cnt;              /* pointer arith! */
-
-               val = *addr;
-               *addr = save[--i];
-
-               if (val != (~cnt)) {
-                       return (cnt * sizeof (long));
-               }
-       }
-       return (maxsize);
+       return (get_ram_size(base, maxsize));
 }
+/*-----------------------------------------------------------------------------
+ * aschex_to_byte --
+ *-----------------------------------------------------------------------------
+ */
 static unsigned char aschex_to_byte (unsigned char *cp)
 {
        u_char byte, c;