diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-14 11:50:54 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-14 11:50:54 +0100 |
| commit | e6fe4bd989b93b1f37a25771fc14478dd33aa0df (patch) | |
| tree | 58943761873a212fa7d7547e5220b16d67fb5daa /board | |
| parent | b02bfc4dfcef3be8276521e1933573e97a5cf203 (diff) | |
| parent | a6bbee66197759f790de83181924bf1d2cf482b2 (diff) | |
| download | talos-obmc-uboot-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.tar.gz talos-obmc-uboot-e6fe4bd989b93b1f37a25771fc14478dd33aa0df.zip | |
Merge 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board')
| -rw-r--r-- | board/barco/titanium/titanium.c | 8 | ||||
| -rw-r--r-- | board/freescale/mx6qarm2/mx6qarm2.c | 7 | ||||
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6qsabreauto.c | 8 | ||||
| -rw-r--r-- | board/freescale/mx6sabresd/mx6sabresd.c | 8 | ||||
| -rw-r--r-- | board/freescale/mx6slevk/mx6slevk.c | 10 | ||||
| -rw-r--r-- | board/wandboard/wandboard.c | 8 |
6 files changed, 7 insertions, 42 deletions
diff --git a/board/barco/titanium/titanium.c b/board/barco/titanium/titanium.c index 6db44882fe..84a7b849ad 100644 --- a/board/barco/titanium/titanium.c +++ b/board/barco/titanium/titanium.c @@ -264,15 +264,9 @@ int board_phy_config(struct phy_device *phydev) int board_eth_init(bd_t *bis) { - int ret; - setup_iomux_enet(); - ret = cpu_eth_init(bis); - if (ret) - printf("FEC MXC: %s:failed\n", __func__); - - return ret; + return cpu_eth_init(bis); } int board_early_init_f(void) diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c index e063407840..6c51f3a182 100644 --- a/board/freescale/mx6qarm2/mx6qarm2.c +++ b/board/freescale/mx6qarm2/mx6qarm2.c @@ -186,13 +186,10 @@ int fecmxc_mii_postcall(int phy) int board_eth_init(bd_t *bis) { struct eth_device *dev; - int ret; + int ret = cpu_eth_init(bis); - ret = cpu_eth_init(bis); - if (ret) { - printf("FEC MXC: %s:failed\n", __func__); + if (ret) return ret; - } dev = eth_get_dev_by_name("FEC"); if (!dev) { diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index fc75eae565..928dadf809 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -192,15 +192,9 @@ int board_phy_config(struct phy_device *phydev) int board_eth_init(bd_t *bis) { - int ret; - setup_iomux_enet(); - ret = cpu_eth_init(bis); - if (ret) - printf("FEC MXC: %s:failed\n", __func__); - - return ret; + return cpu_eth_init(bis); } #define BOARD_REV_B 0x200 diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 2ffc3b8089..12d8c5664e 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -453,15 +453,9 @@ int overwrite_console(void) int board_eth_init(bd_t *bis) { - int ret; - setup_iomux_enet(); - ret = cpu_eth_init(bis); - if (ret) - printf("FEC MXC: %s:failed\n", __func__); - - return ret; + return cpu_eth_init(bis); } int board_early_init_f(void) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 643fdac2b3..dfc5746c7f 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -106,17 +106,9 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_FEC_MXC int board_eth_init(bd_t *bis) { - int ret; - setup_iomux_fec(); - ret = cpu_eth_init(bis); - if (ret) { - printf("FEC MXC: %s:failed\n", __func__); - return ret; - } - - return 0; + return cpu_eth_init(bis); } static int setup_fec(void) diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index 0043bc6460..72e9bb2e97 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -257,15 +257,9 @@ static void setup_display(void) int board_eth_init(bd_t *bis) { - int ret; - setup_iomux_enet(); - ret = cpu_eth_init(bis); - if (ret) - printf("FEC MXC: %s:failed\n", __func__); - - return ret; + return cpu_eth_init(bis); } int board_early_init_f(void) |
