Commit 19403633 authored by Ben Warren's avatar Ben Warren

Moved initialization of NS8382X Ethernet controller to board_eth_init()

Affected boards:
	bc3450
	cpci5200
	mecp5200
	pf2000
	icecube
	o2dnt
	pm520
	sandpoint8245
	total5200
	tqm5200

Removed initialization of the driver from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent ccdd12f8
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
#ifdef CONFIG_VIDEO_SM501 #ifdef CONFIG_VIDEO_SM501
#include <sm501.h> #include <sm501.h>
...@@ -669,3 +670,8 @@ int board_get_height (void) ...@@ -669,3 +670,8 @@ int board_get_height (void)
} }
#endif /* CONFIG_VIDEO_SM501 */ #endif /* CONFIG_VIDEO_SM501 */
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <command.h> #include <command.h>
#include <netdev.h>
#include "mt46v16m16-75.h" #include "mt46v16m16-75.h"
...@@ -259,6 +260,11 @@ void init_ata_reset(void) ...@@ -259,6 +260,11 @@ void init_ata_reset(void)
} }
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
unsigned int addr; unsigned int addr;
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <command.h> #include <command.h>
#include <netdev.h>
#include "mt46v16m16-75.h" #include "mt46v16m16-75.h"
...@@ -259,3 +260,8 @@ void init_power_switch(void) ...@@ -259,3 +260,8 @@ void init_power_switch(void)
__asm__ volatile ("sync"); __asm__ volatile ("sync");
} }
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <command.h> #include <command.h>
#include <netdev.h>
#include "mt46v16m16-75.h" #include "mt46v16m16-75.h"
...@@ -264,6 +265,11 @@ void init_power_switch(void) ...@@ -264,6 +265,11 @@ void init_power_switch(void)
__asm__ volatile ("sync"); __asm__ volatile ("sync");
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
void power_set_reset(int power) void power_set_reset(int power)
{ {
debug("ide_set_reset(%d)\n", power); debug("ide_set_reset(%d)\n", power);
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h> #include <libfdt.h>
#include <netdev.h>
#if defined(CONFIG_LITE5200B) #if defined(CONFIG_LITE5200B)
#include "mt46v32m16.h" #include "mt46v32m16.h"
...@@ -390,3 +391,8 @@ ft_board_setup(void *blob, bd_t *bd) ...@@ -390,3 +391,8 @@ ft_board_setup(void *blob, bd_t *bd)
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
} }
#endif #endif
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
#define SDRAM_MODE 0x00CD0000 #define SDRAM_MODE 0x00CD0000
#define SDRAM_CONTROL 0x504F0000 #define SDRAM_CONTROL 0x504F0000
...@@ -180,3 +181,8 @@ void pci_init_board(void) ...@@ -180,3 +181,8 @@ void pci_init_board(void)
pci_mpc5xxx_init(&hose); pci_mpc5xxx_init(&hose);
} }
#endif #endif
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
#if defined(CONFIG_MPC5200_DDR) #if defined(CONFIG_MPC5200_DDR)
#include "mt46v16m16-75.h" #include "mt46v16m16-75.h"
...@@ -321,3 +322,8 @@ void doc_init (void) ...@@ -321,3 +322,8 @@ void doc_init (void)
doc_probe (CFG_DOC_BASE); doc_probe (CFG_DOC_BASE);
} }
#endif #endif
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,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)
{ {
...@@ -99,3 +100,8 @@ void pci_init_board(void) ...@@ -99,3 +100,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);
}
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
#include "sdram.h" #include "sdram.h"
...@@ -308,3 +309,8 @@ int board_get_height (void) ...@@ -308,3 +309,8 @@ int board_get_height (void)
} }
#endif /* CONFIG_VIDEO_SED13806 */ #endif /* CONFIG_VIDEO_SED13806 */
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h> #include <libfdt.h>
#include <netdev.h>
#ifdef CONFIG_VIDEO_SM501 #ifdef CONFIG_VIDEO_SM501
#include <sm501.h> #include <sm501.h>
...@@ -749,3 +750,8 @@ void ft_board_setup(void *blob, bd_t *bd) ...@@ -749,3 +750,8 @@ void ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
} }
#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,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 ns8382x_initialize(bd_t *bis);
int rtl8139_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);
...@@ -59,6 +60,9 @@ int uli526x_initialize(bd_t *bis); ...@@ -59,6 +60,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;
#ifdef CONFIG_NS8382X
num += ns8382x_initialize(bis);
#endif
#if defined(CONFIG_RTL8139) #if defined(CONFIG_RTL8139)
num += rtl8139_initialize(bis); num += rtl8139_initialize(bis);
#endif #endif
......
...@@ -56,7 +56,6 @@ extern int mpc8220_fec_initialize(bd_t*); ...@@ -56,7 +56,6 @@ extern int mpc8220_fec_initialize(bd_t*);
extern int mv6436x_eth_initialize(bd_t *); extern int mv6436x_eth_initialize(bd_t *);
extern int mv6446x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);
extern int natsemi_initialize(bd_t*); extern int natsemi_initialize(bd_t*);
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 *);
...@@ -237,9 +236,6 @@ int eth_initialize(bd_t *bis) ...@@ -237,9 +236,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#ifdef CONFIG_NATSEMI #ifdef CONFIG_NATSEMI
natsemi_initialize(bis); natsemi_initialize(bis);
#endif
#ifdef CONFIG_NS8382X
ns8382x_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