Message ID | 1317379294-16314-2-git-send-email-simonschwarzcor@gmail.com |
---|---|
State | Accepted |
Commit | c9f3cf14e50d7d7ecf09ebda39d39a2b3a3f804d |
Delegated to: | Albert ARIBAUD |
Headers | show |
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,
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);
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(-)