浏览代码

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>
Ben Warren 17 年之前
父节点
当前提交
6a00217109
共有 3 个文件被更改,包括 14 次插入5 次删除
  1. 13 0
      board/sl8245/sl8245.c
  2. 1 1
      drivers/net/sk98lin/uboot_drv.c
  3. 0 4
      net/eth.c

+ 13 - 0
board/sl8245/sl8245.c

@@ -66,3 +66,16 @@ void pci_init_board(void)
 {
 {
 	pci_mpc824x_init(&hose);
 	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;
+}
+

+ 1 - 1
drivers/net/sk98lin/uboot_drv.c

@@ -70,7 +70,7 @@ int skge_initialize(bd_t * bis)
 		eth_register(dev[i]);
 		eth_register(dev[i]);
 	}
 	}
 
 
-	return numdev;
+	return ((numdev > 0) && (numdev <= SKGE_MAX_CARDS) ? 0 : -1);
 }
 }
 
 
 
 

+ 0 - 4
net/eth.c

@@ -63,7 +63,6 @@ extern int ppc_4xx_eth_initialize(bd_t *);
 extern int rtl8139_initialize(bd_t*);
 extern int rtl8139_initialize(bd_t*);
 extern int rtl8169_initialize(bd_t*);
 extern int rtl8169_initialize(bd_t*);
 extern int scc_initialize(bd_t*);
 extern int scc_initialize(bd_t*);
-extern int skge_initialize(bd_t*);
 extern int tsi108_eth_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);
@@ -200,9 +199,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MPC8220_FEC)
 #if defined(CONFIG_MPC8220_FEC)
 	mpc8220_fec_initialize(bis);
 	mpc8220_fec_initialize(bis);
 #endif
 #endif
-#if defined(CONFIG_SK98)
-	skge_initialize(bis);
-#endif
 #if defined(CONFIG_UEC_ETH1)
 #if defined(CONFIG_UEC_ETH1)
 	uec_initialize(0);
 	uec_initialize(0);
 #endif
 #endif