Commit ccdd12f8 authored by Ben Warren's avatar Ben Warren

Moved initialization of TSI108 Ethernet controller to board_eth_init()

Affected boards:
	mpc7448hpc2

Removed initialization of the driver from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 0b252f50
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <common.h> #include <common.h>
#include <74xx_7xx.h> #include <74xx_7xx.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <netdev.h>
#undef DEBUG #undef DEBUG
...@@ -92,3 +93,12 @@ ft_board_setup(void *blob, bd_t *bd) ...@@ -92,3 +93,12 @@ ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
} }
#endif #endif
int board_eth_init(bd_t *bis)
{
int rc = 0;
#if defined(CONFIG_TSI108_ETH)
rc = tsi108_eth_initialize(bis);
#endif
return rc;
}
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include <asm/cache.h> #include <asm/cache.h>
#ifdef DEBUG #ifdef DEBUG
......
...@@ -49,6 +49,7 @@ int mcffec_initialize(bd_t *bis); ...@@ -49,6 +49,7 @@ int mcffec_initialize(bd_t *bis);
int rtl8139_initialize(bd_t *bis); int rtl8139_initialize(bd_t *bis);
int rtl8169_initialize(bd_t *bis); int rtl8169_initialize(bd_t *bis);
int skge_initialize(bd_t *bis); int skge_initialize(bd_t *bis);
int tsi108_eth_initialize(bd_t *bis);
int uli526x_initialize(bd_t *bis); int uli526x_initialize(bd_t *bis);
/* Boards with PCI network controllers can call this from their board_eth_init() /* Boards with PCI network controllers can call this from their board_eth_init()
......
...@@ -61,7 +61,6 @@ extern int pcnet_initialize(bd_t*); ...@@ -61,7 +61,6 @@ extern int pcnet_initialize(bd_t*);
extern int plb2800_eth_initialize(bd_t*); extern int plb2800_eth_initialize(bd_t*);
extern int ppc_4xx_eth_initialize(bd_t *); extern int ppc_4xx_eth_initialize(bd_t *);
extern int scc_initialize(bd_t*); extern int scc_initialize(bd_t*);
extern int tsi108_eth_initialize(bd_t*);
extern int npe_initialize(bd_t *); extern int npe_initialize(bd_t *);
extern int uec_initialize(int); extern int uec_initialize(int);
...@@ -241,9 +240,6 @@ int eth_initialize(bd_t *bis) ...@@ -241,9 +240,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#ifdef CONFIG_NS8382X #ifdef CONFIG_NS8382X
ns8382x_initialize(bis); ns8382x_initialize(bis);
#endif
#if defined(CONFIG_TSI108_ETH)
tsi108_eth_initialize(bis);
#endif #endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment