diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:42 +0200 |
| commit | a65334019b71d592024f0da930e5499c7deeacb6 (patch) | |
| tree | 092b92dbdb72c877ae237a058bbf87dc20b37431 /arch/arm/configs | |
| parent | 868de66f8df89ace4f05c9f25c3a889e8749c44b (diff) | |
| parent | 874d371f65d8787665fb3f5945ef196738f5bd10 (diff) | |
| download | barebox-a65334019b71d592024f0da930e5499c7deeacb6.tar.gz barebox-a65334019b71d592024f0da930e5499c7deeacb6.tar.xz | |
Merge branch 'for-next/musb'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/am335x_defconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/configs/am335x_defconfig b/arch/arm/configs/am335x_defconfig index 762038c50d..6ef9c838fd 100644 --- a/arch/arm/configs/am335x_defconfig +++ b/arch/arm/configs/am335x_defconfig @@ -75,6 +75,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_LED=y CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y +CONFIG_CMD_USBGADGET=y CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y @@ -89,6 +90,9 @@ CONFIG_OF_BAREBOX_DRIVERS=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y CONFIG_DRIVER_NET_CPSW=y +CONFIG_NET_USB=y +CONFIG_NET_USB_ASIX=y +CONFIG_NET_USB_SMSC95XX=y CONFIG_DRIVER_SPI_OMAP3=y CONFIG_I2C=y CONFIG_I2C_OMAP=y @@ -98,6 +102,15 @@ CONFIG_NAND=y CONFIG_NAND_OMAP_GPMC=y CONFIG_MTD_UBI=y CONFIG_USB_HOST=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DFU=y +CONFIG_USB_GADGET_SERIAL=y +CONFIG_USB_GADGET_FASTBOOT=y +CONFIG_USB_MUSB=y +CONFIG_USB_MUSB_AM335X=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y CONFIG_MCI=y CONFIG_MCI_STARTUP=y CONFIG_MCI_OMAP_HSMMC=y |