Commit 6aca145e authored by Ben Warren's avatar Ben Warren

Moved initialization of GT6426x Ethernet controller to board_eth_init()

Affected boards:
	EVB64260
	P3G4
	ZUMA

Removed initialization of the driver from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent e3090534
...@@ -27,6 +27,7 @@ Skeleton NIC driver for Etherboot ...@@ -27,6 +27,7 @@ Skeleton NIC driver for Etherboot
#include <asm/cache.h> #include <asm/cache.h>
#include <miiphy.h> #include <miiphy.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include "eth.h" #include "eth.h"
#include "eth_addrtbl.h" #include "eth_addrtbl.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <galileo/pci.h> #include <galileo/pci.h>
#include <galileo/gt64260R.h> #include <galileo/gt64260R.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
#include "eth.h" #include "eth.h"
...@@ -248,7 +249,6 @@ int board_early_init_f (void) ...@@ -248,7 +249,6 @@ int board_early_init_f (void)
sram_boot = 1; sram_boot = 1;
#endif #endif
if (!sram_boot)
memoryMapDeviceSpace(DEVICE0, CFG_DEV0_SPACE, CFG_DEV0_SIZE); memoryMapDeviceSpace(DEVICE0, CFG_DEV0_SPACE, CFG_DEV0_SIZE);
memoryMapDeviceSpace(DEVICE1, CFG_DEV1_SPACE, CFG_DEV1_SIZE); memoryMapDeviceSpace(DEVICE1, CFG_DEV1_SPACE, CFG_DEV1_SIZE);
...@@ -443,3 +443,9 @@ display_mem_map(void) ...@@ -443,3 +443,9 @@ display_mem_map(void)
printf(" BOOT: base - 0x%08x\tsize - %dM bytes\twidth - %d bits\n", printf(" BOOT: base - 0x%08x\tsize - %dM bytes\twidth - %d bits\n",
base, size>>20, width); base, size>>20, width);
} }
int board_eth_init(bd_t *bis)
{
gt6426x_eth_initialize(bis);
return 0;
}
...@@ -43,6 +43,7 @@ int cpu_eth_init(bd_t *bis); ...@@ -43,6 +43,7 @@ int cpu_eth_init(bd_t *bis);
/* Driver initialization prototypes */ /* Driver initialization prototypes */
int bfin_EMAC_initialize(bd_t *bis); int bfin_EMAC_initialize(bd_t *bis);
int greth_initialize(bd_t *bis); int greth_initialize(bd_t *bis);
void gt6426x_eth_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);
......
...@@ -39,10 +39,6 @@ static int __def_eth_init(bd_t *bis) ...@@ -39,10 +39,6 @@ static int __def_eth_init(bd_t *bis)
int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init"))); int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init"))); int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
#ifdef CFG_GT_6426x
extern int gt6426x_eth_initialize(bd_t *bis);
#endif
extern int au1x00_enet_initialize(bd_t*); extern int au1x00_enet_initialize(bd_t*);
extern int dc21x4x_initialize(bd_t*); extern int dc21x4x_initialize(bd_t*);
extern int e1000_initialize(bd_t*); extern int e1000_initialize(bd_t*);
...@@ -225,9 +221,6 @@ int eth_initialize(bd_t *bis) ...@@ -225,9 +221,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#ifdef CONFIG_3COM #ifdef CONFIG_3COM
eth_3com_initialize(bis); eth_3com_initialize(bis);
#endif
#ifdef CFG_GT_6426x
gt6426x_eth_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