colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 8697da4262b2504f1be1e5a0a4074a9de9040744..94ab5c6f906e18c565092e6176736ba1327db6f1 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -1,23 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2000-2007
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
 
-obj-$(CONFIG_SCSI_AHCI) += ahci.o
-obj-$(CONFIG_ATA_PIIX) += ata_piix.o
-obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o
-obj-$(CONFIG_FSL_SATA) += fsl_sata.o
-obj-$(CONFIG_IDE_FTIDE020) += ftide020.o
-obj-$(CONFIG_LIBATA) += libata.o
-obj-$(CONFIG_MVSATA_IDE) += mvsata_ide.o
-obj-$(CONFIG_MX51_PATA) += mxc_ata.o
-obj-$(CONFIG_PATA_BFIN) += pata_bfin.o
-obj-$(CONFIG_SATA_DWC) += sata_dwc.o
-obj-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
-obj-$(CONFIG_SATA_SIL) += sata_sil.o
-obj-$(CONFIG_IDE_SIL680) += sil680.o
+obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o
+
+ifndef CONFIG_$(SPL_)BLK
+obj-$(CONFIG_HAVE_BLOCK_DEVICE) += blk_legacy.o
+endif
+
+ifndef CONFIG_SPL_BUILD
+obj-$(CONFIG_IDE) += ide.o
+endif
 obj-$(CONFIG_SANDBOX) += sandbox.o
-obj-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
-obj-$(CONFIG_SYSTEMACE) += systemace.o
+obj-$(CONFIG_$(SPL_TPL_)BLOCK_CACHE) += blkcache.o