net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init

This patch will move au1x00_eth_initialize from net/eth.c to cpu_eth_init
as a part of ongoing eth_initialize cleanup work.  The function ret value
is also fixed as it should be negative on fail.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index 8ddc06a2d59b63040abc676519fb4d3abc2470c0..6272a3aac119dd34be822b0391fd680e844fb596 100644 (file)
--- a/cpu/mips/au1x00_eth.c
+++ b/cpu/mips/au1x00_eth.c
@@ -283,7 +283,7 @@ int au1x00_enet_initialize(bd_t *bis){
 
        if ((dev = (struct eth_device*)malloc(sizeof *dev)) == NULL) {
                puts ("malloc failed\n");
-               return 0;
+               return -1;
        }
 
        memset(dev, 0, sizeof *dev);

diff --git a/cpu/mips/cpu.c b/cpu/mips/cpu.c
index 38d869797a7c791007c3f73827d2f81165a2c2da..b7180b0c6c9be9dfe88bb82747bdaf067c9a2eca 100644 (file)
--- a/cpu/mips/cpu.c
+++ b/cpu/mips/cpu.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 #include <asm/mipsregs.h>
 #include <asm/cacheops.h>
 #include <asm/reboot.h>
@@ -73,3 +74,11 @@ void write_one_tlb(int index, u32 pagemask, u32 hi, u32 low0, u32 low1)
        write_c0_index(index);
        tlb_write_indexed();
 }
+
+int cpu_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_SOC_AU1X00
+       au1x00_enet_initialize(bis);
+#endif
+       return 0;
+}

diff --git a/include/netdev.h b/include/netdev.h
index 3739980114c066ae30977b0c6eee833df8d8e7d9..31115e2b2b340f4219db2f436859d09880f448ac 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -41,6 +41,7 @@ int board_eth_init(bd_t *bis);
 int cpu_eth_init(bd_t *bis);
 
 /* Driver initialization prototypes */
+int au1x00_enet_initialize(bd_t*);
 int bfin_EMAC_initialize(bd_t *bis);
 int dc21x4x_initialize(bd_t *bis);
 int e1000_initialize(bd_t *bis);

diff --git a/net/eth.c b/net/eth.c
index cad8fe3352efb0c2ca8c593ebd836d0e98e9669d..72fed698916f2303121a9c1d69ad7592b49ef8c3 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -39,7 +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")));
 
-extern int au1x00_enet_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_eth_initialize(bd_t *);
@@ -188,9 +187,6 @@ int eth_initialize(bd_t *bis)
 
 #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
        fec_initialize(bis);
-#endif
-#if defined(CONFIG_AU1X00)
-       au1x00_enet_initialize(bis);
 #endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");