summaryrefslogtreecommitdiffstats
path: root/configs/ma5d4evk_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-20 09:31:58 -0400
committerTom Rini <trini@konsulko.com>2016-04-20 09:31:58 -0400
commiteb6b50f631628f48b7e72432ae878e6ff0e306c3 (patch)
tree40a37edba62f5769156b543ea7a5e9c9377d5a15 /configs/ma5d4evk_defconfig
parentec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (diff)
parente6c0bc0643e5a4387fecbcf83080d0b796eb067c (diff)
downloadu-boot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.gz
u-boot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.tar.xz
u-boot-eb6b50f631628f48b7e72432ae878e6ff0e306c3.zip
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts: configs/bcm28155_ap_defconfig configs/dra72_evm_defconfig configs/dra74_evm_defconfig configs/ma5d4evk_defconfig Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/ma5d4evk_defconfig')
-rw-r--r--configs/ma5d4evk_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
index 1448514269..f7973ed6e2 100644
--- a/configs/ma5d4evk_defconfig
+++ b/configs/ma5d4evk_defconfig
@@ -12,5 +12,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4"
CONFIG_SPI_FLASH=y
CONFIG_USB=y
CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set