Commit ad3381cf authored by Ben Warren's avatar Ben Warren

Moved initialization of E1000 Ethernet controller to board_eth_init()

Affected boards:
	ap1000
	mvbc_p
	PM854

Removed initialization of the driver from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 4fce2ace
......@@ -23,6 +23,7 @@
#include <common.h>
#include <command.h>
#include <netdev.h>
#include <asm/processor.h>
#include "powerspan.h"
......@@ -697,3 +698,9 @@ U_BOOT_CMD (swrecon, 1, 0, do_swreconfig,
"swrecon - trigger a board reconfigure to the software selected configuration\n",
"\n"
" - trigger a board reconfigure to the software selected configuration\n");
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
......@@ -328,5 +328,6 @@ void ft_board_setup(void *blob, bd_t *bd)
int board_eth_init(bd_t *bis)
{
return cpu_eth_init(bis); /* Built in FEC comes first */
cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
......@@ -27,6 +27,7 @@
#include <common.h>
#include <pci.h>
#include <netdev.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/immap_85xx.h>
......@@ -289,3 +290,8 @@ pci_init_board(void)
pci_mpc85xx_init(&hose);
#endif /* CONFIG_PCI */
}
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
......@@ -3059,5 +3059,5 @@ e1000_initialize(bd_t * bis)
card_number++;
}
return 1;
return card_number;
}
......@@ -36,6 +36,7 @@
#include <common.h>
#include <malloc.h>
#include <net.h>
#include <netdev.h>
#include <asm/io.h>
#include <pci.h>
......
......@@ -42,6 +42,7 @@ int cpu_eth_init(bd_t *bis);
/* Driver initialization prototypes */
int bfin_EMAC_initialize(bd_t *bis);
int e1000_initialize(bd_t *bis);
int eth_3com_initialize (bd_t * bis);
int greth_initialize(bd_t *bis);
void gt6426x_eth_initialize(bd_t *bis);
......@@ -69,6 +70,9 @@ static inline int pci_eth_init(bd_t *bis)
{
int num = 0;
#ifdef CONFIG_E1000
num += e1000_initialize(bis);
#endif
#ifdef CONFIG_PCNET
num += pcnet_initialize(bis);
#endif
......
......@@ -41,7 +41,6 @@ int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
extern int au1x00_enet_initialize(bd_t*);
extern int dc21x4x_initialize(bd_t*);
extern int e1000_initialize(bd_t*);
extern int eepro100_initialize(bd_t*);
extern int fec_initialize(bd_t*);
extern int mpc8220_fec_initialize(bd_t*);
......@@ -193,9 +192,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_IXP4XX_NPE)
npe_initialize(bis);
#endif
#ifdef CONFIG_E1000
e1000_initialize(bis);
#endif
#ifdef CONFIG_EEPRO100
eepro100_initialize(bis);
#endif
......
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