diff options
| author | Tom Rini <trini@ti.com> | 2014-10-22 13:51:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-22 13:51:45 -0400 |
| commit | 68e80fdda1336068f40915388bbdacfd2b75233a (patch) | |
| tree | deb28e65fdd601e47bf5564f67da3035a840e284 /drivers/mtd/spi/Makefile | |
| parent | 35d4fed320d577a4446531d7b9350ce40065c4b0 (diff) | |
| parent | 8a9cd5ad6f89ab721a352cbb9264bea5ede68789 (diff) | |
| download | talos-obmc-uboot-68e80fdda1336068f40915388bbdacfd2b75233a.tar.gz talos-obmc-uboot-68e80fdda1336068f40915388bbdacfd2b75233a.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/mtd/spi/Makefile')
| -rw-r--r-- | drivers/mtd/spi/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 9e18fb41de..15789a07d8 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -5,13 +5,18 @@ # SPDX-License-Identifier: GPL-2.0+ # +obj-$(CONFIG_DM_SPI_FLASH) += sf-uclass.o + ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o endif +#ifndef CONFIG_DM_SPI +obj-$(CONFIG_SPI_FLASH) += sf_probe.o +#endif obj-$(CONFIG_CMD_SF) += sf.o -obj-$(CONFIG_SPI_FLASH) += sf_params.o sf_probe.o sf_ops.o +obj-$(CONFIG_SPI_FLASH) += sf_ops.o sf_params.o obj-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o |
