diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-10 12:21:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-10 12:21:27 -0400 |
| commit | 31d136926b739b58eca0b12237481d666da66427 (patch) | |
| tree | 728c59a8b1bc55943bc9211e3d5a20077f1136cb /configs | |
| parent | 9fd8b2c8c714b383b6768d53d7b46682fdf87013 (diff) | |
| parent | 29a81142be960a07761f50ccae6cde766e3696d9 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- DaVinci USB updates
- Various OHCI fixes
- Gadget fixes
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/da850evm_defconfig | 5 | ||||
| -rw-r--r-- | configs/da850evm_direct_nor_defconfig | 5 | ||||
| -rw-r--r-- | configs/da850evm_nand_defconfig | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index a161ad5e02..7cbc9fb656 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -65,6 +65,8 @@ CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y +CONFIG_PHY=y +CONFIG_PHY_DA8XX_USB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_DM_SERIAL=y @@ -77,5 +79,8 @@ CONFIG_DM_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_DA8XX=y +CONFIG_USB_MUSB_PIO_ONLY=y CONFIG_USB_STORAGE=y # CONFIG_FAT_WRITE is not set diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index e3c2d13986..2eaa29fb8f 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -54,6 +54,8 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y +CONFIG_PHY=y +CONFIG_PHY_DA8XX_USB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_SPECIFY_CONSOLE_INDEX=y @@ -67,4 +69,7 @@ CONFIG_DM_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_DA8XX=y +CONFIG_USB_MUSB_PIO_ONLY=y CONFIG_USB_STORAGE=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index 96602e514a..7f0ea0c7e4 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -61,6 +61,8 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y +CONFIG_PHY=y +CONFIG_PHY_DA8XX_USB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y CONFIG_DM_SERIAL=y @@ -73,6 +75,9 @@ CONFIG_DM_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_DA8XX=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_DA8XX=y +CONFIG_USB_MUSB_PIO_ONLY=y CONFIG_USB_STORAGE=y # CONFIG_FAT_WRITE is not set CONFIG_USE_TINY_PRINTF=y |