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>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc cmd/Kconfig
Simple merge

diff --cc cmd/Makefile
Simple merge

diff --cc cmd/ubi.c
index 0fa7553072a3b591cd3b0203bcc1c6a4ba40ee15,bb8f97fc2815220ddfc99ba4ffc5e6e66fc5d0c4..767a4a4536407ab5cd47e15e1e89c0a7e9a19d79
--- 1/cmd/ubi.c
--- 2/cmd/ubi.c
+++ b/cmd/ubi.c
@@@ -27,27 -28,12 +28,11 @@@
  #undef ubi_msg
  #define ubi_msg(fmt, ...) printf("UBI: " fmt "\n", ##__VA_ARGS__)
  
- #define DEV_TYPE_NONE         0
- #define DEV_TYPE_NAND         1
- #define DEV_TYPE_ONENAND      2
- #define DEV_TYPE_NOR          3
- 
  /* Private own data */
  static struct ubi_device *ubi;
- static char buffer[80];
- static int ubi_initialized;
- 
- struct selected_dev {
-       char part_name[80];
-       int selected;
-       int nr;
-       struct mtd_info *mtd_info;
- };
- 
- static struct selected_dev ubi_dev;
  
  #ifdef CONFIG_CMD_UBIFS
 -int ubifs_is_mounted(void);
 -void cmd_ubifs_umount(void);
 +#include <ubifs_uboot.h>
  #endif
  
  static void display_volume_info(struct ubi_device *ubi)

diff --cc common/spl/spl_spi.c
Simple merge

diff --cc configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
index e8744aa78f69bf1e5f3eee11f4dc723344910c86,e8744aa78f69bf1e5f3eee11f4dc723344910c86..d457d9420b59007ad35a161f55739d1610fb5a46
--- 1/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
--- 2/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
@@@ -30,6 -30,6 +30,7 @@@ CONFIG_NET_RANDOM_ETHADDR=
  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
@@@ -40,6 -40,6 +41,8 @@@ CONFIG_DM_PCI=
  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

diff --cc configs/ls1012afrwy_qspi_defconfig
index f2cdcaef5b60efa711faec4e5dbdda3046966d6f,f2cdcaef5b60efa711faec4e5dbdda3046966d6f..7fe9556d047e06ebce4fe1cc0a48384ba2ba0c68
--- 1/configs/ls1012afrwy_qspi_defconfig
--- 2/configs/ls1012afrwy_qspi_defconfig
+++ b/configs/ls1012afrwy_qspi_defconfig
@@@ -31,6 -31,6 +31,7 @@@ CONFIG_NET_RANDOM_ETHADDR=
  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 -41,6 +42,8 @@@ CONFIG_DM_PCI=
  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

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge