diff options
author | Ben Warren <biggerbadderben@gmail.com> | 2008-08-31 10:44:19 -0700 |
---|---|---|
committer | Ben Warren <biggerbadderben@gmail.com> | 2008-09-02 21:18:18 -0700 |
commit | ad3381cf4167120db5c7b88e4970245e1d5c0a32 (patch) | |
tree | 93a19cb4ee835e33553e591c9c55c11cb3763548 /board | |
parent | 4fce2aceaf8afd31a252bc782c9dbc497bf40487 (diff) | |
download | u-boot-imx-ad3381cf4167120db5c7b88e4970245e1d5c0a32.zip u-boot-imx-ad3381cf4167120db5c7b88e4970245e1d5c0a32.tar.gz u-boot-imx-ad3381cf4167120db5c7b88e4970245e1d5c0a32.tar.bz2 |
Moved initialization of E1000 Ethernet controller to board_eth_init()
Affected boards:
ap1000
mvbc_p
PM854
Removed initialization of the driver from net/eth.c
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'board')
-rw-r--r-- | board/amirix/ap1000/ap1000.c | 7 | ||||
-rw-r--r-- | board/matrix_vision/mvbc_p/mvbc_p.c | 3 | ||||
-rw-r--r-- | board/pm854/pm854.c | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c index 55277e7..8f30ed9 100644 --- a/board/amirix/ap1000/ap1000.c +++ b/board/amirix/ap1000/ap1000.c @@ -23,6 +23,7 @@ #include <common.h> #include <command.h> +#include <netdev.h> #include <asm/processor.h> #include "powerspan.h" @@ -697,3 +698,9 @@ U_BOOT_CMD (swrecon, 1, 0, do_swreconfig, "swrecon - trigger a board reconfigure to the software selected configuration\n", "\n" " - trigger a board reconfigure to the software selected configuration\n"); + +int board_eth_init(bd_t *bis) +{ + 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 648b45e..c88c4a6 100644 --- a/board/matrix_vision/mvbc_p/mvbc_p.c +++ b/board/matrix_vision/mvbc_p/mvbc_p.c @@ -328,5 +328,6 @@ void ft_board_setup(void *blob, bd_t *bd) int board_eth_init(bd_t *bis) { - return cpu_eth_init(bis); /* Built in FEC comes first */ + cpu_eth_init(bis); /* Built in FEC comes first */ + return pci_eth_init(bis); } diff --git a/board/pm854/pm854.c b/board/pm854/pm854.c index 7dbafb9..f366814 100644 --- a/board/pm854/pm854.c +++ b/board/pm854/pm854.c @@ -27,6 +27,7 @@ #include <common.h> #include <pci.h> +#include <netdev.h> #include <asm/processor.h> #include <asm/mmu.h> #include <asm/immap_85xx.h> @@ -289,3 +290,8 @@ pci_init_board(void) pci_mpc85xx_init(&hose); #endif /* CONFIG_PCI */ } + +int board_eth_init(bd_t *bis) +{ + return pci_eth_init(bis); +} |