diff options
author | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-04-20 09:31:58 -0400 |
commit | eb6b50f631628f48b7e72432ae878e6ff0e306c3 (patch) | |
tree | 40a37edba62f5769156b543ea7a5e9c9377d5a15 /configs/sama5d4_xplained_nandflash_defconfig | |
parent | ec3ab3f9b5c75b5a11f8f6f52951fa8dd45990be (diff) | |
parent | e6c0bc0643e5a4387fecbcf83080d0b796eb067c (diff) |
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/sama5d4_xplained_nandflash_defconfig')
-rw-r--r-- | configs/sama5d4_xplained_nandflash_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig index 96aefc712ad..b2067b9e596 100644 --- a/configs/sama5d4_xplained_nandflash_defconfig +++ b/configs/sama5d4_xplained_nandflash_defconfig @@ -12,4 +12,5 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_OF_LIBFDT=y |