diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-02 13:02:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-02 17:01:46 -0400 |
| commit | 592cd5defd4f71d34ffcbd8dd3326bc10f662e20 (patch) | |
| tree | 0824c4d2c60d79b7be18ba82209d899e4d4f8c34 /configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | |
| parent | 2ba8bf207481cfb319f54a1bef67f6f068831a58 (diff) | |
| parent | b3bec2525604d6b42bb9e7fd719c84b022447db3 (diff) | |
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>
Diffstat (limited to 'configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig')
| -rw-r--r-- | configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig index e8744aa78f..d457d9420b 100644 --- a/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig @@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y 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 +41,8 @@ CONFIG_DM_PCI=y 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 |