From: Tom Rini Date: Tue, 2 Oct 2018 17:02:22 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-spi X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=592cd5defd4f71d34ffcbd8dd3326bc10f662e20;p=u-boot.git 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 --- 592cd5defd4f71d34ffcbd8dd3326bc10f662e20 diff --cc cmd/ubi.c index 0fa7553072,bb8f97fc28..767a4a4536 --- a/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 #endif static void display_volume_info(struct ubi_device *ubi) diff --cc configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig index e8744aa78f,e8744aa78f..d457d9420b --- a/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 f2cdcaef5b,f2cdcaef5b..7fe9556d04 --- a/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