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 /drivers/spi/Makefile | |
| 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 'drivers/spi/Makefile')
| -rw-r--r-- | drivers/spi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 6679987cad..ee99508766 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -8,6 +8,7 @@ ifdef CONFIG_DM_SPI obj-y += spi-uclass.o obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o obj-$(CONFIG_SOFT_SPI) += soft_spi.o +obj-$(CONFIG_SPI_MEM) += spi-mem.o else obj-y += spi.o obj-$(CONFIG_SOFT_SPI) += soft_spi_legacy.o |