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: Ben Warren <biggerbadderben@gmail.com>

diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c
index fa5b6d4a923a7342d7c2406f24077f75258b3f96..ca8bab52d96613c9d416a9d0f6ac36d9596629e1 100644 (file)
--- a/board/evb64260/eth.c
+++ b/board/evb64260/eth.c
@@ -27,6 +27,7 @@ Skeleton NIC driver for Etherboot
 #include <asm/cache.h>
 #include <miiphy.h>
 #include <net.h>
+#include <netdev.h>
 
 #include "eth.h"
 #include "eth_addrtbl.h"

diff --git a/board/evb64260/evb64260.c b/board/evb64260/evb64260.c
index ab599410b27f1a17d521e15b09684cf4c5553ffd..bc108d0594e12cbbeac1f74e288210481a6e4764 100644 (file)
--- a/board/evb64260/evb64260.c
+++ b/board/evb64260/evb64260.c
@@ -31,6 +31,7 @@
 #include <galileo/pci.h>
 #include <galileo/gt64260R.h>
 #include <net.h>
+#include <netdev.h>
 
 #include <asm/io.h>
 #include "eth.h"
@@ -248,7 +249,6 @@ int board_early_init_f (void)
                sram_boot = 1;
 #endif
 
-       if (!sram_boot)
                memoryMapDeviceSpace(DEVICE0, CFG_DEV0_SPACE, CFG_DEV0_SIZE);
 
        memoryMapDeviceSpace(DEVICE1, CFG_DEV1_SPACE, CFG_DEV1_SIZE);
@@ -443,3 +443,9 @@ display_mem_map(void)
     printf(" BOOT:  base - 0x%08x\tsize - %dM bytes\twidth - %d bits\n",
           base, size>>20, width);
 }
+
+int board_eth_init(bd_t *bis)
+{
+       gt6426x_eth_initialize(bis);
+       return 0;
+}

diff --git a/include/netdev.h b/include/netdev.h
index b1dadd84b3b5201f5be2f05a7997a3fd76eadf1c..666d12d3890ef98bc53da2e13e28a226721c6a13 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -43,6 +43,7 @@ int cpu_eth_init(bd_t *bis);
 /* Driver initialization prototypes */
 int bfin_EMAC_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 mcdmafec_initialize(bd_t *bis);
 int mcffec_initialize(bd_t *bis);

diff --git a/net/eth.c b/net/eth.c
index aa6b2c8c2a47ba13641bb826d3b99998e519a1e6..99efa164c293822c375fd442da4bd2b09290e76e 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -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 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 dc21x4x_initialize(bd_t*);
 extern int e1000_initialize(bd_t*);
@@ -225,9 +221,6 @@ int eth_initialize(bd_t *bis)
 #endif
 #ifdef CONFIG_3COM
        eth_3com_initialize(bis);
-#endif
-#ifdef CFG_GT_6426x
-       gt6426x_eth_initialize(bis);
 #endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");