]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
devkit8000: protect board_mmc_init
authorSimon Schwarz <simonschwarzcor@googlemail.com>
Fri, 30 Sep 2011 00:41:33 +0000 (00:41 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 27 Oct 2011 19:56:30 +0000 (21:56 +0200)
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

index f50d113347f4003829ed3df746603c7a22d76b2d..fee0dff33c7277eaf51210226cd98cd6ac45fbca 100644 (file)
@@ -120,7 +120,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);