[U-Boot] [PATCH 3/3] cmd: scsi: compile out scsi_init when CONFIG_DISK is defined

When CONFIG_DISK is defined, disk_uclass takes care of scsi_init, so compile out scsi_init when CONFIG_DISK is defined.

Signed-off-by: Mugunthan V N mugunthanvnm@ti.com --- cmd/scsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmd/scsi.c b/cmd/scsi.c index bc7d1b6..e2ae046 100644 --- a/cmd/scsi.c +++ b/cmd/scsi.c @@ -181,7 +181,8 @@ int scsi_get_disk_count(void) return scsi_max_devs; }

-#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) && \ + !defined(CONFIG_DISK) void scsi_init(void) { int busdevfunc = -1;