Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / drivers / mtd / spi / Makefile

diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile
index 0fa867db4c2f5fecf2f8c6f2c946d62b35e51bfd..ff48b25f6f324eefaeaaa38d19c36fe8bcb236f7 100644 (file)
--- a/drivers/mtd/spi/Makefile
+++ b/drivers/mtd/spi/Makefile
@@ -5,36 +5,19 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-include $(TOPDIR)/config.mk
-
-LIB    := $(obj)libspi_flash.o
+obj-$(CONFIG_DM_SPI_FLASH) += sf-uclass.o
 
 ifdef CONFIG_SPL_BUILD
-COBJS-$(CONFIG_SPL_SPI_LOAD)   += spi_spl_load.o
-COBJS-$(CONFIG_SPL_SPI_BOOT)   += fsl_espi_spl.o
-endif
-
-ifdef CONFIG_CMD_SF
-COBJS-y        += spi_flash.o
+obj-$(CONFIG_SPL_SPI_LOAD)     += spi_spl_load.o
+obj-$(CONFIG_SPL_SPI_BOOT)     += fsl_espi_spl.o
 endif
-COBJS-$(CONFIG_SPI_FLASH) += spi_flash_probe.o spi_flash_ops.o
-COBJS-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.o
-COBJS-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o
-
-COBJS  := $(COBJS-y)
-SRCS   := $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-
-all:   $(LIB)
-
-$(LIB): $(obj).depend $(OBJS)
-       $(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
 
-#########################################################################
+#ifndef CONFIG_DM_SPI
+obj-$(CONFIG_SPI_FLASH) += sf_probe.o
+#endif
+obj-$(CONFIG_CMD_SF) += sf.o
+obj-$(CONFIG_SPI_FLASH) += sf_ops.o sf_params.o
+obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o
+obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o
+obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o
+obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o