diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-02 08:43:48 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-02 08:43:48 +0200 |
| commit | cc49da249cf2f380d2fed5571fad65ce6494fc95 (patch) | |
| tree | 00bf437b6a370c0640d5fafd93780406d3531ebb /board/samsung/common/board.c | |
| parent | 9637a1bb896efe392a58dd2772e2c3fcb646409d (diff) | |
| parent | 567802bbd6bf1c809d37fef9244fc8a692244e73 (diff) | |
| download | blackbird-obmc-uboot-cc49da249cf2f380d2fed5571fad65ce6494fc95.tar.gz blackbird-obmc-uboot-cc49da249cf2f380d2fed5571fad65ce6494fc95.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
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 de154e0f64..9dc7c832e6 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 |
