summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorwdenk <wdenk>2002-11-19 23:01:07 +0000
committerwdenk <wdenk>2002-11-19 23:01:07 +0000
commitb2184c314de0af9788ce505b413030d2114cfa4a (patch)
treefd167faf0174a2e7ec1bb775b78952478fab391a /board
parent0ae1175bb2ee24cce54df634761993b363ce888f (diff)
downloadu-boot-imx-b2184c314de0af9788ce505b413030d2114cfa4a.zip
u-boot-imx-b2184c314de0af9788ce505b413030d2114cfa4a.tar.gz
u-boot-imx-b2184c314de0af9788ce505b413030d2114cfa4a.tar.bz2
* Patch by Daniel Engström, 18 Nov 2002:
Fixes for x86 port (mostly strings issues) * Patch by Ken Chou, 18 Nov 2002: Fix for natsemi NIC cards (DP83815) * Patch by Pierre Aubert, 19 Nov 2002: fix a bug for the MII configuration, and some warnings
Diffstat (limited to 'board')
-rw-r--r--board/RPXClassic/RPXClassic.c23
-rw-r--r--board/trab/u-boot.lds1
2 files changed, 15 insertions, 9 deletions
diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c
index 4d2100b..aed9479 100644
--- 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
+
}
/* ------------------------------------------------------------------------- */
@@ -254,6 +257,10 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
}
return (maxsize);
}
+/*-----------------------------------------------------------------------------
+ * aschex_to_byte --
+ *-----------------------------------------------------------------------------
+ */
static unsigned char aschex_to_byte (unsigned char *cp)
{
u_char byte, c;
diff --git a/board/trab/u-boot.lds b/board/trab/u-boot.lds
index 59834af..92a369f 100644
--- a/board/trab/u-boot.lds
+++ b/board/trab/u-boot.lds
@@ -33,7 +33,6 @@ SECTIONS
.text :
{
cpu/arm920t/start.o (.text)
- lib_arm/_udivsi3.o (.text)
lib_arm/_umodsi3.o (.text)
lib_generic/zlib.o (.text)
lib_generic/crc32.o (.text)