On 17/08/2012 22:42, Benoît Thébaudeau wrote:
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
Changes for v2:
- Do not define cpu_mmc_init() if CONFIG_FSL_ESDHC is not defined.
.../arch/arm/cpu/armv7/imx-common/cpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git u-boot-4d3c95f.orig/arch/arm/cpu/armv7/imx-common/cpu.c u-boot-4d3c95f/arch/arm/cpu/armv7/imx-common/cpu.c index b3195dd..7313fc0 100644 --- u-boot-4d3c95f.orig/arch/arm/cpu/armv7/imx-common/cpu.c +++ u-boot-4d3c95f/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) {
Acked-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic