diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-08-31 09:59:33 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-09-02 21:18:16 -0700 |
| commit | ccdd12f83ef93719fbe85f642aa4dc648b9498f0 (patch) | |
| tree | 172383dede7a00bdac46164664d13da50c58586e | |
| parent | 0b252f50ae218ae15bfb63af44227972686ebc56 (diff) | |
| download | u-boot-ccdd12f83ef93719fbe85f642aa4dc648b9498f0.tar.gz u-boot-ccdd12f83ef93719fbe85f642aa4dc648b9498f0.tar.bz2 u-boot-ccdd12f83ef93719fbe85f642aa4dc648b9498f0.zip | |
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: Ben Warren <biggerbadderben@gmail.com>
| -rw-r--r-- | board/freescale/mpc7448hpc2/mpc7448hpc2.c | 10 | ||||
| -rw-r--r-- | drivers/net/tsi108_eth.c | 1 | ||||
| -rw-r--r-- | include/netdev.h | 1 | ||||
| -rw-r--r-- | net/eth.c | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/board/freescale/mpc7448hpc2/mpc7448hpc2.c b/board/freescale/mpc7448hpc2/mpc7448hpc2.c index 6f74c314eb..cfdbed5393 100644 --- a/board/freescale/mpc7448hpc2/mpc7448hpc2.c +++ b/board/freescale/mpc7448hpc2/mpc7448hpc2.c @@ -32,6 +32,7 @@ #include <common.h> #include <74xx_7xx.h> #include <fdt_support.h> +#include <netdev.h> #undef DEBUG @@ -92,3 +93,12 @@ ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } #endif + +int board_eth_init(bd_t *bis) +{ + int rc = 0; +#if defined(CONFIG_TSI108_ETH) + rc = tsi108_eth_initialize(bis); +#endif + return rc; +} diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 2534097df5..50fa765f70 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c @@ -34,6 +34,7 @@ #include <common.h> #include <malloc.h> #include <net.h> +#include <netdev.h> #include <asm/cache.h> #ifdef DEBUG diff --git a/include/netdev.h b/include/netdev.h index b333755ba0..5f6b38f3db 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -49,6 +49,7 @@ int mcffec_initialize(bd_t *bis); int rtl8139_initialize(bd_t *bis); int rtl8169_initialize(bd_t *bis); int skge_initialize(bd_t *bis); +int tsi108_eth_initialize(bd_t *bis); int uli526x_initialize(bd_t *bis); /* Boards with PCI network controllers can call this from their board_eth_init() @@ -61,7 +61,6 @@ extern int pcnet_initialize(bd_t*); extern int plb2800_eth_initialize(bd_t*); extern int ppc_4xx_eth_initialize(bd_t *); extern int scc_initialize(bd_t*); -extern int tsi108_eth_initialize(bd_t*); extern int npe_initialize(bd_t *); extern int uec_initialize(int); @@ -242,9 +241,6 @@ int eth_initialize(bd_t *bis) #ifdef CONFIG_NS8382X ns8382x_initialize(bis); #endif -#if defined(CONFIG_TSI108_ETH) - tsi108_eth_initialize(bis); -#endif if (!eth_devices) { puts ("No ethernet found.\n"); show_boot_progress (-64); |