diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-15 15:18:31 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-15 15:18:31 +0100 |
commit | 6579d15c58e2b6b051f126ea8b77dd767252aa14 (patch) | |
tree | cac9f9205db8c28a764ad8282d3a909bf95e8db4 /include/configs/m28evk.h | |
parent | c44bb3a30f5a1332176edce1a91c0e2cf666ee8f (diff) | |
parent | 19a0f7fa271de0345bb2df90d443c547c41e8037 (diff) | |
download | u-boot-imx-6579d15c58e2b6b051f126ea8b77dd767252aa14.zip u-boot-imx-6579d15c58e2b6b051f126ea8b77dd767252aa14.tar.gz u-boot-imx-6579d15c58e2b6b051f126ea8b77dd767252aa14.tar.bz2 |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/m28evk.h')
-rw-r--r-- | include/configs/m28evk.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 1b51fe2..f2725cc 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -233,7 +233,9 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_MXS -#define CONFIG_EHCI_MXS_PORT 1 +#define CONFIG_EHCI_MXS_PORT0 +#define CONFIG_EHCI_MXS_PORT1 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_IS_TDI #define CONFIG_USB_STORAGE #endif @@ -244,7 +246,6 @@ #ifdef CONFIG_CMD_SPI #define CONFIG_HARD_SPI #define CONFIG_MXS_SPI -#define CONFIG_MXS_SPI_DMA_ENABLE #define CONFIG_SPI_HALF_DUPLEX #define CONFIG_DEFAULT_SPI_BUS 2 #define CONFIG_DEFAULT_SPI_CS 0 |