[U-Boot] [PATCH 1/3] drivers: block: Kconfig: set default n to CONFIG_DISK

Mugunthan V N mugunthanvnm at ti.com
Thu Mar 3 06:06:27 CET 2016


When a platform is converted to support DM and when its scsi
driver is not converted to support DM, there is a build break as
multiple definition of scsi_init(). So select CONFIG_DISK only
when the platform supports CONFIG_DISK.

drivers/built-in.o: In function `scsi_init':
/home/mugunthan/workspace/git/work/u-boot/dm-sata/drivers/block/disk-uclass.c:37: multiple definition of `scsi_init'
board/sunxi/built-in.o:/home/mugunthan/workspace/git/work/u-boot/dm-sata/board/sunxi/ahci.c:74: first defined here
Makefile:1171: recipe for target 'u-boot' failed
make: *** [u-boot] Error 1

Signed-off-by: Mugunthan V N <mugunthanvnm at ti.com>
---
 drivers/block/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 915c1eb..e62bf75 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -1,7 +1,7 @@
 config DISK
 	bool "Support disk controllers with driver model"
 	depends on DM
-	default y if DM
+	default n if DM
 	help
 	  This enables a uclass for disk controllers in U-Boot. Various driver
 	  types can use this, such as AHCI/SATA. It does not provide any standard
-- 
2.7.2.333.g70bd996



More information about the U-Boot mailing list