From: Ian Campbell <ijc@hellion.org.uk>
Date: Fri, 7 Mar 2014 01:20:56 +0000 (+0000)
Subject: ahci-plat: Provide a weak scsi_init hook
X-Git-Tag: v2014.04-rc2~8
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=c6f3d50b9bbe33541b3cd47a4f35efc4f4ae0fa7

ahci-plat: Provide a weak scsi_init hook

This allow the platform to register the platform ahci device.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index e9a7708ce8..92e85c4db5 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -33,6 +33,7 @@
 #include <nand.h>
 #include <onenand_uboot.h>
 #include <mmc.h>
+#include <scsi.h>
 #include <libfdt.h>
 #include <fdtdec.h>
 #include <post.h>
@@ -593,6 +594,11 @@ void board_init_r(gd_t *id, ulong dest_addr)
 	mmc_initialize(gd->bd);
 #endif
 
+#ifdef CONFIG_CMD_SCSI
+	puts("SCSI:  ");
+	scsi_init();
+#endif
+
 #ifdef CONFIG_HAS_DATAFLASH
 	AT91F_DataflashInit();
 	dataflash_print_info();
diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c
index e64df4f98d..22621bfb77 100644
--- a/drivers/block/ahci.c
+++ b/drivers/block/ahci.c
@@ -930,6 +930,11 @@ int ahci_init(u32 base)
 err_out:
 	return rc;
 }
+
+void __weak scsi_init(void)
+{
+}
+
 #endif
 
 /*