diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-27 09:34:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-27 09:34:07 -0400 |
| commit | 222701e157176a66628e4f399f52ca3307b018c9 (patch) | |
| tree | f6cde4ef97d5a332008a34ed29ec084b8b9765a6 /configs | |
| parent | bfe28bc70fc8b192878d6e8b7f7db344091643cf (diff) | |
| parent | 1f174689c13a257e3b149d4550805a85bdaf27c3 (diff) | |
| download | u-boot-222701e157176a66628e4f399f52ca3307b018c9.tar.gz u-boot-222701e157176a66628e4f399f52ca3307b018c9.tar.bz2 u-boot-222701e157176a66628e4f399f52ca3307b018c9.zip | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi
- fix for fsl_qspi read timeout (Thomas)
- spi-mem read data size fix (Ye Li)
- SiFive SPI driver, mmc_spi flags (Bhargav, Anup)
- Micron spi-nor parts (Ashish)
- MT7629 spi-mem driver(Weijie)
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/mt7629_rfb_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index d6a7c84df3..c0a586f248 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -64,7 +64,7 @@ CONFIG_DM_SERIAL=y CONFIG_MTK_SERIAL=y CONFIG_SPI=y CONFIG_DM_SPI=y -CONFIG_MTK_QSPI=y +CONFIG_MTK_SNFI_SPI=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_WATCHDOG=y |