Patchwork [U-Boot,1/2] devkit8000: protect board_mmc_init

login
register
mail settings
Submitter Simon Schwarz
Date Sept. 30, 2011, 10:41 a.m.
Message ID <1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com>
Download mbox | patch
Permalink /patch/117090/
State Accepted
Commit c9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d
Delegated to: Albert ARIBAUD
Headers show

Comments

Simon Schwarz - Sept. 30, 2011, 10:41 a.m.
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(-)
Albert ARIBAUD - Oct. 14, 2011, 7:58 p.m.
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,

Patch

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);