diff options
| author | Tom Rini <trini@ti.com> | 2013-10-08 09:03:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-08 09:03:15 -0400 |
| commit | 968294bd7b9b540f53c1fb3c809da464623a4362 (patch) | |
| tree | 141a04ec65894787e2d7c4eda808ef700b81101f /drivers/mtd/spi/Makefile | |
| parent | b770e88a6c2548727f0d57a3e9e8bb0830f977b5 (diff) | |
| parent | c4a796329d00ce46de6b5afeb1fdabec82830677 (diff) | |
| download | u-boot-imx-968294bd7b9b540f53c1fb3c809da464623a4362.zip u-boot-imx-968294bd7b9b540f53c1fb3c809da464623a4362.tar.gz u-boot-imx-968294bd7b9b540f53c1fb3c809da464623a4362.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/mtd/spi/Makefile')
| -rw-r--r-- | drivers/mtd/spi/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 191138a..86ffc59 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -14,16 +14,11 @@ COBJS-$(CONFIG_SPL_SPI_LOAD) += spi_spl_load.o COBJS-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o endif -COBJS-$(CONFIG_SPI_FLASH) += spi_flash.o -COBJS-$(CONFIG_SPI_FLASH_ATMEL) += atmel.o -COBJS-$(CONFIG_SPI_FLASH_EON) += eon.o -COBJS-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.o -COBJS-$(CONFIG_SPI_FLASH_MACRONIX) += macronix.o -COBJS-$(CONFIG_SPI_FLASH_SPANSION) += spansion.o -COBJS-$(CONFIG_SPI_FLASH_SST) += sst.o -COBJS-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.o -COBJS-$(CONFIG_SPI_FLASH_WINBOND) += winbond.o -COBJS-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o +ifdef CONFIG_CMD_SF +COBJS-y += sf.o +endif +COBJS-$(CONFIG_SPI_FLASH) += sf_probe.o sf_ops.o +COBJS-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o COBJS-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o COBJS := $(COBJS-y) |