From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 14 Oct 2011 21:58:45 +0200
Subject: [U-Boot] [PATCH 1/2] devkit8000: protect board_mmc_init
In-Reply-To: <1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com>
References: <1317379294-16314-1-git-send-email-simonschwarzcor@gmail.com>
	<1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com>
Message-ID: <4E989475.8040405@aribaud.net>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Simon,

Le 30/09/2011 12:41, Simon Schwarz a ?crit :
> This function is also defined in omap-common/spl_mmc.de so the implementation
> in devkit8000.c was protected by a ifdef.
>
> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
> ---
>   board/timll/devkit8000/devkit8000.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
> index 9124569..dc99afb 100644
> --- a/board/timll/devkit8000/devkit8000.c
> +++ b/board/timll/devkit8000/devkit8000.c
> @@ -125,7 +125,7 @@ void set_muxconf_regs(void)
>   	MUX_DEVKIT8000();
>   }
>
> -#ifdef CONFIG_GENERIC_MMC
> +#if defined(CONFIG_GENERIC_MMC)&&  !defined(CONFIG_SPL_BUILD)
>   int board_mmc_init(bd_t *bis)
>   {
>   	omap_mmc_init(0);

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.