summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-01 00:25:43 +0000
committerwdenk <wdenk>2005-04-01 00:25:43 +0000
commitea287debe1980182adbe8c63b71bb82193dad5b7 (patch)
tree34044b91763e6e85704b7a54acd34c042931461d /cpu
parentef2807c667a91135fbb91b805b852ccfbff03587 (diff)
downloadu-boot-imx-ea287debe1980182adbe8c63b71bb82193dad5b7.zip
u-boot-imx-ea287debe1980182adbe8c63b71bb82193dad5b7.tar.gz
u-boot-imx-ea287debe1980182adbe8c63b71bb82193dad5b7.tar.bz2
* Patch by Masami Komiya, 30 Mar 2005:
add SNTP support and expand time server and time offset fields of DHCP support. See doc/README.SNTP * Patch by Steven Scholz, 13 Dec 2004: Fix bug in at91rm920 ethernet driver
Diffstat (limited to 'cpu')
-rw-r--r--cpu/at91rm9200/at91rm9200_ether.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/cpu/at91rm9200/at91rm9200_ether.c b/cpu/at91rm9200/at91rm9200_ether.c
index b6247c9..2ec888f 100644
--- a/cpu/at91rm9200/at91rm9200_ether.c
+++ b/cpu/at91rm9200/at91rm9200_ether.c
@@ -169,14 +169,16 @@ int eth_init (bd_t * bd)
AT91C_PA10_ETX1 | AT91C_PA9_ETX0 | AT91C_PA8_ETXEN |
AT91C_PA7_ETXCK_EREFCK;
-#if defined(CONFIG_AT91C_USE_RMII) && !defined(CONFIG_CMC_PU2)
- *AT91C_PIOB_PDR = AT91C_PB25_EF100 |
- AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV |
+#ifdef CONFIG_AT91C_USE_RMII
+ *AT91C_PIOB_PDR = AT91C_PB19_ERXCK;
+ *AT91C_PIOB_BSR = AT91C_PB19_ERXCK;
+#else
+ *AT91C_PIOB_PDR = AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV |
AT91C_PB16_ERX3 | AT91C_PB15_ERX2 | AT91C_PB14_ETXER |
AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
/* Select B Register */
- *AT91C_PIOB_BSR = AT91C_PB25_EF100 | AT91C_PB19_ERXCK | AT91C_PB18_ECOL |
+ *AT91C_PIOB_BSR = AT91C_PB19_ERXCK | AT91C_PB18_ECOL |
AT91C_PB17_ERXDV | AT91C_PB16_ERX3 | AT91C_PB15_ERX2 |
AT91C_PB14_ETXER | AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
#endif