diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-30 21:58:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-30 21:58:44 -0400 |
| commit | fe4ba689a0cb2bb2ceafb88556a57bd80814b648 (patch) | |
| tree | 1012656ba1d3e9f8288d69de33c71417b2f22466 /configs | |
| parent | f413d1cae89143ad45b066b3d3bc602deafcb50a (diff) | |
| parent | 4c043712e9910ef1d612aedbd8304a1f7348ef5f (diff) | |
| download | u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.zip u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.gz u-boot-imx-fe4ba689a0cb2bb2ceafb88556a57bd80814b648.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/dra7xx_evm.h
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/colibri_vf_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 235f004..fce6bac 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -39,6 +39,7 @@ CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y |