From: Ben Warren <biggerbadderben@gmail.com>
Date: Sat, 12 Jul 2008 07:17:50 +0000 (-0700)
Subject: Moved initialization of SKGE Ethernet driver to board code.
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6a002171098e968bd5b362347d2831224fab6048;p=u-boot.git

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>
---

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);
 }
 
 
diff --git a/net/eth.c b/net/eth.c
index 0ad9907f83..4e508a0f91 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -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