summaryrefslogtreecommitdiff
path: root/board
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 /board
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 'board')
-rw-r--r--board/atmel/at91sam9x5ek/at91sam9x5ek.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
index edb0886..8773e6f 100644
--- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c
+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c
@@ -295,6 +295,9 @@ int board_init(void)
at91_macb_hw_init();
#endif
+#if defined(CONFIG_USB_OHCI_NEW) || defined(CONFIG_USB_EHCI)
+ at91_uhp_hw_init();
+#endif
#ifdef CONFIG_LCD
at91sam9x5ek_lcd_hw_init();
#endif