summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2009-10-16 00:06:37 -0500
committerBen Warren <biggerbadderben@gmail.com>2009-12-13 21:31:26 -0800
commitac6b362a2598b8cd27beb071fa6224cf8b121e1b (patch)
tree0ad76bba6a3c44c1778a261ac570918400497ae4
parenta1725999b8b7527971183122cdfb54e2f87f61ae (diff)
downloadblackbird-obmc-uboot-ac6b362a2598b8cd27beb071fa6224cf8b121e1b.tar.gz
blackbird-obmc-uboot-ac6b362a2598b8cd27beb071fa6224cf8b121e1b.zip
LAN91C96: Enable NET_MULTI LAN driver
This modification is NOT tested on any of the platforms modified as I dont have them. please help by testing+building+fixing Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat
-rw-r--r--board/apollon/apollon.c12
-rw-r--r--include/configs/B2.h2
-rw-r--r--include/configs/apollon.h3
-rw-r--r--include/configs/assabet.h3
-rw-r--r--include/configs/gcplus.h3
-rw-r--r--include/configs/lubbock.h3
-rw-r--r--include/configs/omap1510inn.h3
-rw-r--r--include/configs/omap1610h2.h3
-rw-r--r--include/configs/omap1610inn.h3
-rw-r--r--include/configs/omap2420h4.h3
-rw-r--r--include/configs/omap5912osk.h3
-rw-r--r--include/configs/omap730p2.h3
-rw-r--r--include/configs/pleb2.h6
13 files changed, 32 insertions, 18 deletions
diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 8964eba7f8..b93e880886 100644
--- a/board/apollon/apollon.c
+++ b/board/apollon/apollon.c
@@ -24,6 +24,7 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <netdev.h>
#include <asm/arch/omap2420.h>
#include <asm/io.h>
#include <asm/arch/bits.h>
@@ -138,13 +139,14 @@ void wait_for_command_complete(unsigned int wd_base)
}
/*******************************************************************
- * Routine:ether_init
+ * Routine:board_eth_init
* Description: take the Ethernet controller out of reset and wait
* for the EEPROM load to complete.
******************************************************************/
-void ether_init(void)
+int board_eth_init(bd_t *bis)
{
-#ifdef CONFIG_DRIVER_LAN91C96
+ int rc = 0;
+#ifdef CONFIG_LAN91C96
int cnt = 20;
__raw_writeb(0x03, OMAP2420_CTRL_BASE + 0x0f2); /*protect->gpio74 */
@@ -171,10 +173,10 @@ void ether_init(void)
mask_config_reg(ETH_CONTROL_REG, 0x01);
udelay(1000);
-
+ rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
eth_reset_err_out:
- return;
#endif
+ return rc;
}
/**********************************************
diff --git a/include/configs/B2.h b/include/configs/B2.h
index e5439f3b54..d7806e9628 100644
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -58,7 +58,7 @@
/*
* Hardware drivers
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x04000300 /* base address */
#define CONFIG_SMC_USE_32_BIT
#undef CONFIG_SHOW_ACTIVITY
diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index adab454223..ed14f7aa68 100644
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -88,7 +88,8 @@
/*
* SMC91c96 Etherent
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE (APOLLON_CS1_BASE+0x300)
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 8c5b84cf69..d17d4bd968 100644
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -53,7 +53,8 @@
/*
* Hardware drivers
*/
-#define CONFIG_DRIVER_LAN91C96 /* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96 /* we have an SMC9194 on-board */
#define CONFIG_LAN91C96_BASE 0x18000000
/*
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 85db4f5c77..41294b9be6 100644
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -66,7 +66,8 @@
/*
* Hardware drivers
*/
-#define CONFIG_DRIVER_LAN91C96 /* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96 /* we have an SMC9194 on-board */
#define CONFIG_LAN91C96_BASE 0x100e0000
/*
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 43913cada9..0a6921044c 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -58,7 +58,8 @@
/*
* Hardware drivers
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x0C000000
/*
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 8408209d6c..b0ebafd7bd 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -60,7 +60,8 @@
#define CONFIG_SMC9196_BASE 0x08000300
#define CONFIG_SMC9196_EXT_PHY
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x08000300
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 42e0198316..0bbb5b35c1 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -57,7 +57,8 @@
/*
* Hardware drivers
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x04000300
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 22c873e0ca..832dd426b6 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -58,7 +58,8 @@
*/
/*
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x04000300
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 9c1884244e..6ab44387a6 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -81,7 +81,8 @@
/*
* SMC91c96 Etherent
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE (H4_CS1_BASE+0x300)
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index d0ce9dc915..bc660e39e8 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -61,7 +61,8 @@
*/
/*
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x04800300
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index 32a9b2397b..a6a8a023f1 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -65,7 +65,8 @@
* Hardware drivers
*/
-#define CONFIG_DRIVER_LAN91C96
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96
#define CONFIG_LAN91C96_BASE 0x04000300
#define CONFIG_LAN91C96_EXT_PHY
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 635ef71bc9..9e694118c5 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -56,8 +56,10 @@
*/
/* None - PLEB 2 doesn't have any of this.
- #define CONFIG_DRIVER_LAN91C96
- #define CONFIG_LAN91C96_BASE 0x0C000000 */
+ #define CONFIG_NET_MULTI
+ #define CONFIG_LAN91C96
+ #define CONFIG_LAN91C96_BASE 0x0C000000
+ */
/*
* select serial console configuration
OpenPOWER on IntegriCloud