diff options
| author | Tom Rini <trini@ti.com> | 2014-06-08 07:58:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-08 07:58:41 -0400 |
| commit | 55e8250bd3cfd996d1caa04f520160a89ec04754 (patch) | |
| tree | 64060c77eb5467f9a4c5ee421978db49d1a48ad3 /board/samsung/common/board.c | |
| parent | 3e1fa221f94b7ae3389d166882b77f1da5895f22 (diff) | |
| parent | 5ed28948a3ffe6c735386e59c132989869beaa3e (diff) | |
| download | u-boot-imx-55e8250bd3cfd996d1caa04f520160a89ec04754.zip u-boot-imx-55e8250bd3cfd996d1caa04f520160a89ec04754.tar.gz u-boot-imx-55e8250bd3cfd996d1caa04f520160a89ec04754.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/samsung/common/board.c')
| -rw-r--r-- | board/samsung/common/board.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index de154e0..9dc7c83 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -243,13 +243,6 @@ int board_eth_init(bd_t *bis) int board_mmc_init(bd_t *bis) { int ret; - -#ifdef CONFIG_SDHCI - /* mmc initializattion for available channels */ - ret = exynos_mmc_init(gd->fdt_blob); - if (ret) - debug("mmc init failed\n"); -#endif #ifdef CONFIG_DWMMC /* dwmmc initializattion for available channels */ ret = exynos_dwmmc_init(gd->fdt_blob); @@ -257,6 +250,12 @@ int board_mmc_init(bd_t *bis) debug("dwmmc init failed\n"); #endif +#ifdef CONFIG_SDHCI + /* mmc initializattion for available channels */ + ret = exynos_mmc_init(gd->fdt_blob); + if (ret) + debug("mmc init failed\n"); +#endif return ret; } #endif |