diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-07-12 00:17:50 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-08-26 22:18:08 -0700 |
| commit | 6a002171098e968bd5b362347d2831224fab6048 (patch) | |
| tree | b7240a72ef681d611411f6950062c940a633a613 | |
| parent | 8379f42bc745eb9e4ca551a30fd2d0a63f740d75 (diff) | |
| download | blackbird-obmc-uboot-6a002171098e968bd5b362347d2831224fab6048.tar.gz blackbird-obmc-uboot-6a002171098e968bd5b362347d2831224fab6048.zip | |
Moved initialization of SKGE Ethernet driver to board code.
The only board using this driver is the SL8245 board.
Removed initialization for the driver from net/eth.c
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
| -rw-r--r-- | board/sl8245/sl8245.c | 13 | ||||
| -rw-r--r-- | drivers/net/sk98lin/uboot_drv.c | 2 | ||||
| -rw-r--r-- | net/eth.c | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/board/sl8245/sl8245.c b/board/sl8245/sl8245.c index 86478871bc..c853755a1c 100644 --- a/board/sl8245/sl8245.c +++ b/board/sl8245/sl8245.c @@ -66,3 +66,16 @@ void pci_init_board(void) { pci_mpc824x_init(&hose); } + +extern int skge_initialize(bd_t *bis); + +int board_eth_init(bd_t *bis) +{ + int rc = 0; + +#if defined(CONFIG_SK98) + rc = skge_initialize(bis); +#endif + return rc; +} + diff --git a/drivers/net/sk98lin/uboot_drv.c b/drivers/net/sk98lin/uboot_drv.c index 8b04842c1a..205e7d2e99 100644 --- a/drivers/net/sk98lin/uboot_drv.c +++ b/drivers/net/sk98lin/uboot_drv.c @@ -70,7 +70,7 @@ int skge_initialize(bd_t * bis) eth_register(dev[i]); } - return numdev; + return ((numdev > 0) && (numdev <= SKGE_MAX_CARDS) ? 0 : -1); } @@ -63,7 +63,6 @@ extern int ppc_4xx_eth_initialize(bd_t *); extern int rtl8139_initialize(bd_t*); extern int rtl8169_initialize(bd_t*); extern int scc_initialize(bd_t*); -extern int skge_initialize(bd_t*); extern int tsi108_eth_initialize(bd_t*); extern int npe_initialize(bd_t *); extern int uec_initialize(int); @@ -200,9 +199,6 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_MPC8220_FEC) mpc8220_fec_initialize(bis); #endif -#if defined(CONFIG_SK98) - skge_initialize(bis); -#endif #if defined(CONFIG_UEC_ETH1) uec_initialize(0); #endif |
