diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-25 13:01:58 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-25 13:01:58 +0100 |
commit | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 (patch) | |
tree | da95eeaa6578048658ff60f20a9b498730c67917 /include/configs/mx35pdk.h | |
parent | 3786a942b5892441982f5d8908303f360bac9f8c (diff) | |
parent | 1d4fd0dc3b45de7b7a706285845ef5b527422014 (diff) | |
download | u-boot-imx-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.zip u-boot-imx-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.tar.gz u-boot-imx-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.tar.bz2 |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx35pdk.h')
-rw-r--r-- | include/configs/mx35pdk.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index d89db7a..1c2f599 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -112,13 +112,15 @@ #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_CMD_DATE +#define CONFIG_CMD_USB +#define CONFIG_USB_STORAGE #define CONFIG_CMD_MMC #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 1 #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ @@ -244,6 +246,18 @@ #define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_LARGEPAGE +/* EHCI driver */ +#define CONFIG_USB_EHCI +#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1 +#define CONFIG_EHCI_IS_TDI +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_USB_EHCI_MXC +#define CONFIG_MXC_USB_PORT 0 +#define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERFACE_DIFF_UNI | \ + MXC_EHCI_POWER_PINS_ENABLED | \ + MXC_EHCI_OC_PIN_ACTIVE_LOW) +#define CONFIG_MXC_USB_PORTSC (MXC_EHCI_UTMI_16BIT | MXC_EHCI_MODE_UTMI) + /* mmc driver */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC |