A previous Commit converted the LAN91C96 Ethernet driver to using the CONFIG_NET_MULTI API, but did not include full board support. This patch finishes the job. Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
@@ -95,7 +95,6 @@ void s_init(void)
********************************************************/
int misc_init_r(void)
{
- ether_init(); /* better done here so timers are init'ed */
return (0);
}
@@ -25,6 +25,7 @@
*/
#include <common.h>
+#include <netdev.h>
#include <SA-1100.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -117,3 +118,14 @@ dram_init(void)
+
+#ifdef CONFIG_CMD_NET
+int board_eth_init(bd_t *bis)
+{
+ int rc = 0;
+#ifdef CONFIG_LAN91C96
+ rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
+#endif
+ return rc;
+}
#include <asm/hardware.h>
@@ -125,3 +126,14 @@ int dram_init (void)
@@ -68,3 +69,14 @@ dram_init(void)
@@ -31,6 +31,7 @@
* MA 02111-1307 USA
#include <twl4030.h>
#include <asm/io.h>
#include <asm/arch/mux.h>
@@ -86,3 +87,14 @@ void set_muxconf_regs(void)
/* platform specific muxes */
MUX_ZOOM1_MDK();
@@ -29,6 +29,7 @@
#ifdef CONFIG_STATUS_LED
#include <status_led.h>
#endif
@@ -177,3 +178,14 @@ void set_muxconf_regs (void)
MUX_ZOOM2 ();
@@ -26,6 +26,7 @@
@@ -68,3 +69,14 @@ int dram_init (void)
return 0;
@@ -30,6 +30,7 @@
@@ -127,3 +128,14 @@ int dram_init (void)
@@ -32,6 +32,7 @@
#if defined(CONFIG_OMAP1610)
#include <./configs/omap1510.h>
@@ -302,3 +303,14 @@ void peripheral_power_enable (void)
*SW_CLOCK_REQUEST |= UART1_48MHZ_ENABLE;
@@ -22,6 +22,7 @@
#include <asm/arch/omap2420.h>
#include <asm/arch/bits.h>
@@ -842,3 +843,14 @@ void update_mux(u32 btype,u32 mtype)
@@ -34,6 +34,7 @@
@@ -306,3 +307,14 @@ int checkboard(void)
#if defined(CONFIG_OMAP730)
#include <./configs/omap730.h>
@@ -263,3 +264,14 @@ void peripheral_power_enable (void)
*MuxConfReg &= (0xFF1FFFFF);
*MuxConfReg &= (0xF1FFFFFF);
@@ -98,7 +98,7 @@
#define CONFIG_CMD_EEPROM
#define CONFIG_CMD_I2C
-
+#define CONFIG_NET_MULTI
#define CONFIG_BOOTDELAY 5
#define CONFIG_ETHADDR 00:50:c2:1e:af:fb
#define CONFIG_BOOTARGS "setenv bootargs root=/dev/ram ip=192.168.0.70:::::eth0:off \