29 lines
959 B
Diff
29 lines
959 B
Diff
|
diff -urN u-boot-2008.10-0rig/drivers/net/macb.c u-boot-2008.10/drivers/net/macb.c
|
||
|
|
--- u-boot-2008.10-0rig/drivers/net/macb.c 2008-10-18 21:30:31.000000000 +0200
|
||
|
|
+++ u-boot-2008.10/drivers/net/macb.c 2008-12-28 23:44:11.000000000 +0100
|
||
|
|
@@ -415,18 +415,16 @@
|
||
|
|
|
||
|
|
/* choose RMII or MII mode. This depends on the board */
|
||
|
|
#ifdef CONFIG_RMII
|
||
|
|
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
|
||
|
|
- defined(CONFIG_AT91SAM9263)
|
||
|
|
- macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
|
||
|
|
-#else
|
||
|
|
+#if defined(CONFIG_AVR32)
|
||
|
|
macb_writel(macb, USRIO, 0);
|
||
|
|
-#endif
|
||
|
|
#else
|
||
|
|
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
|
||
|
|
- defined(CONFIG_AT91SAM9263)
|
||
|
|
- macb_writel(macb, USRIO, MACB_BIT(CLKEN));
|
||
|
|
+ macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
|
||
|
|
+#endif
|
||
|
|
#else
|
||
|
|
+#if defined(CONFIG_AVR32)
|
||
|
|
macb_writel(macb, USRIO, MACB_BIT(MII));
|
||
|
|
+#else
|
||
|
|
+ macb_writel(macb, USRIO, MACB_BIT(CLKEN));
|
||
|
|
#endif
|
||
|
|
#endif /* CONFIG_RMII */
|
||
|
|
|