diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-08-31 21:41:08 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-09-02 21:18:16 -0700 |
| commit | 0b252f50ae218ae15bfb63af44227972686ebc56 (patch) | |
| tree | 98e5a13a7c1574f7fa1061fa9dc97293d7e014a3 /board | |
| parent | 02d69891d95ee76b0e86e1715a4dc0b964a57cb7 (diff) | |
| download | blackbird-obmc-uboot-0b252f50ae218ae15bfb63af44227972686ebc56.tar.gz blackbird-obmc-uboot-0b252f50ae218ae15bfb63af44227972686ebc56.zip | |
Moved initialization of RTL8139 Ethernet controller to board_eth_init()
Affected boards:
hidden_dragon
MPC8544DS
MPC8610HPCN
R2DPLUS
TB0229
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/freescale/mpc8544ds/mpc8544ds.c | 8 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c | 8 | ||||
| -rw-r--r-- | board/hidden_dragon/hidden_dragon.c | 6 | ||||
| -rw-r--r-- | board/r2dplus/r2dplus.c | 5 | ||||
| -rw-r--r-- | board/tb0229/tb0229.c | 5 |
5 files changed, 28 insertions, 4 deletions
diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 1e29773cbe..eaf6fa3200 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -33,6 +33,7 @@ #include <libfdt.h> #include <fdt_support.h> #include <tsec.h> +#include <netdev.h> #include "../common/pixis.h" #include "../common/sgmii_riser.h" @@ -465,9 +466,9 @@ get_board_sys_clk(ulong dummy) return val; } -#ifdef CONFIG_TSEC_ENET int board_eth_init(bd_t *bis) { +#ifdef CONFIG_TSEC_ENET struct tsec_info_struct tsec_info[2]; volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); uint io_sel = (gur->pordevsr & MPC85xx_PORDEVSR_IO_SEL) >> 19; @@ -497,10 +498,9 @@ int board_eth_init(bd_t *bis) tsec_eth_init(bis, tsec_info, num); - - return 0; -} #endif + return pci_eth_init(bis); +} #if defined(CONFIG_OF_BOARD_SETUP) diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 1bb563e41d..97f7f49e49 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -29,6 +29,7 @@ #include <asm/io.h> #include <libfdt.h> #include <fdt_support.h> +#include <netdev.h> #include "../common/pixis.h" @@ -379,3 +380,10 @@ get_board_sys_clk(ulong dummy) return val; } + +int board_eth_init(bd_t *bis) +{ + /* Initialize TSECs */ + cpu_eth_init(bis); + return pci_eth_init(bis); +} diff --git a/board/hidden_dragon/hidden_dragon.c b/board/hidden_dragon/hidden_dragon.c index 5713a3384f..2d7a7870e5 100644 --- a/board/hidden_dragon/hidden_dragon.c +++ b/board/hidden_dragon/hidden_dragon.c @@ -27,6 +27,7 @@ #include <common.h> #include <mpc824x.h> #include <pci.h> +#include <netdev.h> int checkboard (void) { @@ -93,3 +94,8 @@ void pci_init_board(void) { pci_mpc824x_init(&hose); } + +int board_eth_init(bd_t *bis) +{ + return pci_eth_init(bis); +} diff --git a/board/r2dplus/r2dplus.c b/board/r2dplus/r2dplus.c index 8fb8ff667a..b962dd1fe7 100644 --- a/board/r2dplus/r2dplus.c +++ b/board/r2dplus/r2dplus.c @@ -76,3 +76,8 @@ void pci_init_board(void) { pci_sh7751_init(&hose); } + +int board_eth_init(bd_t *bis) +{ + return pci_eth_init(bis); +} diff --git a/board/tb0229/tb0229.c b/board/tb0229/tb0229.c index 921bd3adcd..2abb4a7e2d 100644 --- a/board/tb0229/tb0229.c +++ b/board/tb0229/tb0229.c @@ -46,3 +46,8 @@ int checkboard (void) return 0; } + +int board_eth_init(bd_t *bis) +{ + return pci_eth_init(bis); +} |
