summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-09 20:01:48 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-01-09 20:01:48 +0100
commit612404c28a64a6df300642a1550a65dcc8e01f82 (patch)
tree5be664967ba39c93dc27da5cc547d350e7c0fc17 /include/configs
parentea33fb1a32e8e3f408b311823cabbb7453148f80 (diff)
parentac81e1ccf7135d8004763bbf9bef1d95a03fbe92 (diff)
downloadu-boot-imx-612404c28a64a6df300642a1550a65dcc8e01f82.zip
u-boot-imx-612404c28a64a6df300642a1550a65dcc8e01f82.tar.gz
u-boot-imx-612404c28a64a6df300642a1550a65dcc8e01f82.tar.bz2
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/at91sam9x5ek.h29
1 files changed, 28 insertions, 1 deletions
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 1317582..f9e5a4a 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -90,6 +90,14 @@
#define CONFIG_CMD_NAND
#define CONFIG_CMD_SF
#define CONFIG_CMD_MMC
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_USB
+
+/*
+ * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0)
+ * NB: in this case, USB 1.1 devices won't be recognized.
+ */
+
/* SDRAM */
#define CONFIG_NR_DRAM_BANKS 1
@@ -142,9 +150,12 @@
/* MMC */
#ifdef CONFIG_CMD_MMC
#define CONFIG_MMC
-#define CONFIG_CMD_FAT
#define CONFIG_GENERIC_MMC
#define CONFIG_GENERIC_ATMEL_MCI
+#endif
+
+/* FAT */
+#ifdef CONFIG_CMD_FAT
#define CONFIG_DOS_PARTITION
#endif
@@ -154,6 +165,22 @@
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_MACB_SEARCH_PHY
+/* USB */
+#ifdef CONFIG_CMD_USB
+#ifdef CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ATMEL
+#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2
+#else
+#define CONFIG_USB_OHCI_NEW
+#define CONFIG_SYS_USB_OHCI_CPU_INIT
+#define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI
+#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9x5"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3
+#endif
+#define CONFIG_USB_ATMEL
+#define CONFIG_USB_STORAGE
+#endif
+
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE