From 5dfb3ee3f54e2382a08d72906f0e79ecf944f6e3 Mon Sep 17 00:00:00 2001
From: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Date: Sun, 19 Oct 2008 12:08:50 +0900
Subject: 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>
---
 cpu/mips/au1x00_eth.c | 2 +-
 cpu/mips/cpu.c        | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'cpu/mips')

diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index 8ddc06a2d..6272a3aac 100644
--- 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 38d869797..b7180b0c6 100644
--- 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;
+}
-- 
cgit v1.2.3