From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?= Date: Fri, 17 Aug 2012 22:42:55 +0200 (CEST) Subject: [U-Boot] [PATCH v2] mx5/6: Fix cpu_mmc_init() return value In-Reply-To: <831373943.2519022.1345220741788.JavaMail.root@advansee.com> Message-ID: <1070429626.2524198.1345236175687.JavaMail.root@advansee.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 Cc: Stefano Babic --- 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) {