summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-10-26 07:54:25 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-10-26 07:54:25 +0200
commit4c25761337570e63e9e2631a81de221e692251e3 (patch)
treef288433990a6bec1c42261690ac573d0316f3d48 /board
parentc68436fa427a69ea308d74c410067507d6c7103b (diff)
parent9924ca6e9b1933b8ea2bb0ca49fe67df9856ccc5 (diff)
downloadblackbird-obmc-uboot-4c25761337570e63e9e2631a81de221e692251e3.tar.gz
blackbird-obmc-uboot-4c25761337570e63e9e2631a81de221e692251e3.zip
Merge remote-tracking branch 'u-boot-atmel/master'
Diffstat (limited to 'board')
-rw-r--r--board/atmel/at91sam9x5ek/at91sam9x5ek.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index 06028aa01e..edb088680d 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -31,6 +31,7 @@
#include <asm/arch/clk.h>
#include <lcd.h>
#include <atmel_hlcdc.h>
+#include <atmel_mci.h>
#ifdef CONFIG_MACB
#include <net.h>
#endif
@@ -258,6 +259,15 @@ void spi_cs_deactivate(struct spi_slave *slave)
}
#endif /* CONFIG_ATMEL_SPI */
+#ifdef CONFIG_GENERIC_ATMEL_MCI
+int board_mmc_init(bd_t *bd)
+{
+ at91_mci_hw_init();
+
+ return atmel_mci_init((void *)ATMEL_BASE_HSMCI0);
+}
+#endif
+
int board_early_init_f(void)
{
at91_seriald_hw_init();
OpenPOWER on IntegriCloud