aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Campbell2014-03-07 01:20:56 +0000
committerTom Rini2014-03-10 13:50:31 -0400
commitc6f3d50b9bbe33541b3cd47a4f35efc4f4ae0fa7 (patch)
treea0e7e5ccbd271ed1ef0dce92b4d88385bd3a224b
parentba650e9b5263bfc7579e6775676441eeeca2edc4 (diff)
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>
-rw-r--r--arch/arm/lib/board.c6
-rw-r--r--drivers/block/ahci.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index e9a7708ce8d..92e85c4db51 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 e64df4f98d6..22621bfb77d 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
/*