Commit 0b252f50 authored by Ben Warren's avatar Ben Warren

Moved initialization of RTL8139 Ethernet controller to board_eth_init()

Affected boards:
	hidden_dragon
	MPC8544DS
	MPC8610HPCN
	R2DPLUS
	TB0229

Removed initialization of the driver from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 02d69891
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <tsec.h> #include <tsec.h>
#include <netdev.h>
#include "../common/pixis.h" #include "../common/pixis.h"
#include "../common/sgmii_riser.h" #include "../common/sgmii_riser.h"
...@@ -465,9 +466,9 @@ get_board_sys_clk(ulong dummy) ...@@ -465,9 +466,9 @@ get_board_sys_clk(ulong dummy)
return val; return val;
} }
#ifdef CONFIG_TSEC_ENET
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
#ifdef CONFIG_TSEC_ENET
struct tsec_info_struct tsec_info[2]; struct tsec_info_struct tsec_info[2];
volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19; uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19;
...@@ -497,10 +498,9 @@ int board_eth_init(bd_t *bis) ...@@ -497,10 +498,9 @@ int board_eth_init(bd_t *bis)
tsec_eth_init(bis, tsec_info, num); tsec_eth_init(bis, tsec_info, num);
return 0;
}
#endif #endif
return pci_eth_init(bis);
}
#if defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_BOARD_SETUP)
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <libfdt.h> #include <libfdt.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <netdev.h>
#include "../common/pixis.h" #include "../common/pixis.h"
...@@ -379,3 +380,10 @@ get_board_sys_clk(ulong dummy) ...@@ -379,3 +380,10 @@ get_board_sys_clk(ulong dummy)
return val; return val;
} }
int board_eth_init(bd_t *bis)
{
/* Initialize TSECs */
cpu_eth_init(bis);
return pci_eth_init(bis);
}
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <mpc824x.h> #include <mpc824x.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
int checkboard (void) int checkboard (void)
{ {
...@@ -93,3 +94,8 @@ void pci_init_board(void) ...@@ -93,3 +94,8 @@ void pci_init_board(void)
{ {
pci_mpc824x_init(&hose); pci_mpc824x_init(&hose);
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -76,3 +76,8 @@ void pci_init_board(void) ...@@ -76,3 +76,8 @@ void pci_init_board(void)
{ {
pci_sh7751_init(&hose); pci_sh7751_init(&hose);
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -46,3 +46,8 @@ int checkboard (void) ...@@ -46,3 +46,8 @@ int checkboard (void)
return 0; return 0;
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <pci.h> #include <pci.h>
......
...@@ -46,6 +46,7 @@ int greth_initialize(bd_t *bis); ...@@ -46,6 +46,7 @@ int greth_initialize(bd_t *bis);
int macb_eth_initialize(int id, void *regs, unsigned int phy_addr); int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
int mcdmafec_initialize(bd_t *bis); int mcdmafec_initialize(bd_t *bis);
int mcffec_initialize(bd_t *bis); int mcffec_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 uli526x_initialize(bd_t *bis); int uli526x_initialize(bd_t *bis);
...@@ -57,6 +58,9 @@ int uli526x_initialize(bd_t *bis); ...@@ -57,6 +58,9 @@ int uli526x_initialize(bd_t *bis);
static inline int pci_eth_init(bd_t *bis) static inline int pci_eth_init(bd_t *bis)
{ {
int num = 0; int num = 0;
#if defined(CONFIG_RTL8139)
num += rtl8139_initialize(bis);
#endif
#if defined(CONFIG_RTL8169) #if defined(CONFIG_RTL8169)
num += rtl8169_initialize(bis); num += rtl8169_initialize(bis);
#endif #endif
......
...@@ -60,7 +60,6 @@ extern int ns8382x_initialize(bd_t*); ...@@ -60,7 +60,6 @@ extern int ns8382x_initialize(bd_t*);
extern int pcnet_initialize(bd_t*); 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 rtl8139_initialize(bd_t*);
extern int scc_initialize(bd_t*); extern int scc_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 *);
...@@ -245,9 +244,6 @@ int eth_initialize(bd_t *bis) ...@@ -245,9 +244,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#if defined(CONFIG_TSI108_ETH) #if defined(CONFIG_TSI108_ETH)
tsi108_eth_initialize(bis); tsi108_eth_initialize(bis);
#endif
#if defined(CONFIG_RTL8139)
rtl8139_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