summaryrefslogtreecommitdiff
path: root/include/configs
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 /include/configs
parentc68436fa427a69ea308d74c410067507d6c7103b (diff)
parent9924ca6e9b1933b8ea2bb0ca49fe67df9856ccc5 (diff)
downloadu-boot-imx-4c25761337570e63e9e2631a81de221e692251e3.zip
u-boot-imx-4c25761337570e63e9e2631a81de221e692251e3.tar.gz
u-boot-imx-4c25761337570e63e9e2631a81de221e692251e3.tar.bz2
Merge remote-tracking branch 'u-boot-atmel/master'
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/at91sam9x5ek.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index cbdc3e9..71f765b 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -89,6 +89,7 @@
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_NAND
#define CONFIG_CMD_SF
+#define CONFIG_CMD_MMC
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -138,6 +139,15 @@
#define CONFIG_CMD_UBIFS
#endif
+/* MMC */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_MMC
+#define CONFIG_CMD_FAT
+#define CONFIG_GENERIC_MMC
+#define CONFIG_GENERIC_ATMEL_MCI
+#define CONFIG_DOS_PARTITION
+#endif
+
/* Ethernet */
#define CONFIG_MACB
#define CONFIG_RMII