summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-08-31 10:39:12 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-09-02 21:18:18 -0700
commite1d7480b5de1fd4830bf7cf5e2237d3b0846d08d (patch)
tree1ebc9217b2cd886948db05c4ab28ea101df4bd53 /board
parenta0aad08f9427ac00218bdb2cb649833ce6ec9b8d (diff)
downloadblackbird-obmc-uboot-e1d7480b5de1fd4830bf7cf5e2237d3b0846d08d.tar.gz
blackbird-obmc-uboot-e1d7480b5de1fd4830bf7cf5e2237d3b0846d08d.zip
Moved initialization of MPC5xxx_FEC Ethernet driver to CPU directory
Modified board_eth_init() functions of boards that have this FEC in addition to other Ethernet controllers. Affected boards: bc3450 icecube mvbc_p o2dnt pm520 total5200 tq5200 Removed initialization of controller from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'board')
-rw-r--r--board/bc3450/bc3450.c1
-rw-r--r--board/icecube/icecube.c1
-rw-r--r--board/matrix_vision/mvbc_p/mvbc_p.c6
-rw-r--r--board/o2dnt/o2dnt.c1
-rw-r--r--board/pm520/pm520.c1
-rw-r--r--board/total5200/total5200.c1
-rw-r--r--board/tqc/tqm5200/tqm5200.c1
7 files changed, 12 insertions, 0 deletions
diff --git a/board/bc3450/bc3450.c b/board/bc3450/bc3450.c
index e27c23416f..7ddf74c1c8 100644
--- a/board/bc3450/bc3450.c
+++ b/board/bc3450/bc3450.c
@@ -673,5 +673,6 @@ int board_get_height (void)
int board_eth_init(bd_t *bis)
{
+ cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c
index 2ab86be300..d84ab3adce 100644
--- a/board/icecube/icecube.c
+++ b/board/icecube/icecube.c
@@ -394,5 +394,6 @@ ft_board_setup(void *blob, bd_t *bd)
int board_eth_init(bd_t *bis)
{
+ cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
diff --git a/board/matrix_vision/mvbc_p/mvbc_p.c b/board/matrix_vision/mvbc_p/mvbc_p.c
index 3332f5aca6..648b45e434 100644
--- a/board/matrix_vision/mvbc_p/mvbc_p.c
+++ b/board/matrix_vision/mvbc_p/mvbc_p.c
@@ -35,6 +35,7 @@
#include <fpga.h>
#include <environment.h>
#include <fdt_support.h>
+#include <netdev.h>
#include <asm/io.h>
#include "fpga.h"
#include "mvbc_p.h"
@@ -324,3 +325,8 @@ void ft_board_setup(void *blob, bd_t *bd)
ft_cpu_setup(blob, bd);
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
}
+
+int board_eth_init(bd_t *bis)
+{
+ return cpu_eth_init(bis); /* Built in FEC comes first */
+}
diff --git a/board/o2dnt/o2dnt.c b/board/o2dnt/o2dnt.c
index 37832dea8c..19faf52aff 100644
--- a/board/o2dnt/o2dnt.c
+++ b/board/o2dnt/o2dnt.c
@@ -184,5 +184,6 @@ void pci_init_board(void)
int board_eth_init(bd_t *bis)
{
+ cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c
index c9610fbafb..a9d63cc35a 100644
--- a/board/pm520/pm520.c
+++ b/board/pm520/pm520.c
@@ -325,5 +325,6 @@ void doc_init (void)
int board_eth_init(bd_t *bis)
{
+ cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
diff --git a/board/total5200/total5200.c b/board/total5200/total5200.c
index c1848fc5a1..ec00a67df1 100644
--- a/board/total5200/total5200.c
+++ b/board/total5200/total5200.c
@@ -312,5 +312,6 @@ int board_get_height (void)
int board_eth_init(bd_t *bis)
{
+ cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index d75aa9b879..5152331abd 100644
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -753,5 +753,6 @@ void ft_board_setup(void *blob, bd_t *bd)
int board_eth_init(bd_t *bis)
{
+ cpu_eth_init(bis); /* Built in FEC comes first */
return pci_eth_init(bis);
}
OpenPOWER on IntegriCloud