summaryrefslogtreecommitdiff
path: root/board/apollon
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 /board/apollon
parenta1725999b8b7527971183122cdfb54e2f87f61ae (diff)
downloadu-boot-imx-ac6b362a2598b8cd27beb071fa6224cf8b121e1b.zip
u-boot-imx-ac6b362a2598b8cd27beb071fa6224cf8b121e1b.tar.gz
u-boot-imx-ac6b362a2598b8cd27beb071fa6224cf8b121e1b.tar.bz2
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 (limited to 'board/apollon')
-rw-r--r--board/apollon/apollon.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 8964eba..b93e880 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;
}
/**********************************************