diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-20 09:14:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-20 09:14:03 -0400 |
| commit | e8c185bb15f7e362f0d77e042b6811966917a6b7 (patch) | |
| tree | bcf45fb8bc98c545ddf981e7b3b9504e8b723b63 /configs | |
| parent | 64fabed9715a85c0ebcd092c8e8f5f2f280c719c (diff) | |
| parent | 7c654683464dc4cd89f9a8198e26336263390b57 (diff) | |
Merge tag 'u-boot-stm32-20190619' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- Update STM32MP entry in MAINTAINERS
- Handle correctly binding for g-tx-fifo-size for USB DWC2 driver
- Fix trusted STM32MP1 defconfig with correct ethernet driver
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/stm32mp15_trusted_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index 66361c87155..5fe94778235 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -73,7 +73,7 @@ CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y -CONFIG_ETH_DESIGNWARE=y +CONFIG_DWC_ETH_QOS=y CONFIG_PHY=y CONFIG_PHY_STM32_USBPHYC=y CONFIG_PINCONF=y |