commit 592cd5defd4f71d34ffcbd8dd3326bc10f662e20
author Tom Rini <trini@konsulko.com> Tue Oct 02 13:02:22 2018 -0400
committer Tom Rini <trini@konsulko.com> Tue Oct 02 17:01:46 2018 -0400
tree 0824c4d2c60d79b7be18ba82209d899e4d4f8c34
parent 2ba8bf207481cfb319f54a1bef67f6f068831a58
parent b3bec2525604d6b42bb9e7fd719c84b022447db3

Merge branch 'master' of git://git.denx.de/u-boot-spi

This is the PR for SPI-NAND changes along with few spi changes.

[trini: Re-sync changes for ls1012afrwy_qspi*_defconfig]
Signed-off-by: Tom Rini <trini@konsulko.com>

configs/ls1012afrwy_qspi_defconfig

diff --git a/configs/ls1012afrwy_qspi_defconfig b/configs/ls1012afrwy_qspi_defconfig
index f2cdcae..7fe9556 100644
--- a/configs/ls1012afrwy_qspi_defconfig
+++ b/configs/ls1012afrwy_qspi_defconfig
@@ -31,6 +31,7 @@
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_DM_MMC=y
+CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_FSL_PFE=y
@@ -41,6 +42,8 @@
 CONFIG_DM_PCI_COMPAT=y
 CONFIG_PCIE_LAYERSCAPE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y