diff options
| author | Benoît Thébaudeau <benoit.thebaudeau@advansee.com> | 2012-08-17 10:42:55 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-01 14:58:27 +0200 |
| commit | ecb0f3175522a6201abad9910be59512684f6cda (patch) | |
| tree | f0abc9f273ff2de91c0bfd2cb927d4446a8b86dd /arch/arm/cpu/armv7 | |
| parent | c6b52c4927df227c94650122363b8b342ddb62f0 (diff) | |
| download | u-boot-imx-ecb0f3175522a6201abad9910be59512684f6cda.zip u-boot-imx-ecb0f3175522a6201abad9910be59512684f6cda.tar.gz u-boot-imx-ecb0f3175522a6201abad9910be59512684f6cda.tar.bz2 | |
mx5/6: Fix cpu_mmc_init() return value
Do not pretend to have initialized mmc successfully if CONFIG_FSL_ESDHC is not
defined. Instead, only implement a custom cpu_mmc_init() when it does something.
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/imx-common/cpu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/imx-common/cpu.c b/arch/arm/cpu/armv7/imx-common/cpu.c index e7bd0bf..fa1d468 100644 --- a/arch/arm/cpu/armv7/imx-common/cpu.c +++ b/arch/arm/cpu/armv7/imx-common/cpu.c @@ -111,18 +111,16 @@ int cpu_eth_init(bd_t *bis) return rc; } +#ifdef CONFIG_FSL_ESDHC /* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init() */ int cpu_mmc_init(bd_t *bis) { -#ifdef CONFIG_FSL_ESDHC return fsl_esdhc_mmc_init(bis); -#else - return 0; -#endif } +#endif void reset_cpu(ulong addr) { |