summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2014-03-07 01:20:57 +0000
committerTom Rini <trini@ti.com>2014-03-10 13:50:31 -0400
commitb946322670ca8eda2d41c854a00a863076df6446 (patch)
treea3ca07d0ad3b4b4d0821f331e161ad5afb780ef8
parentc6f3d50b9bbe33541b3cd47a4f35efc4f4ae0fa7 (diff)
downloadu-boot-imx-b946322670ca8eda2d41c854a00a863076df6446.zip
u-boot-imx-b946322670ca8eda2d41c854a00a863076df6446.tar.gz
u-boot-imx-b946322670ca8eda2d41c854a00a863076df6446.tar.bz2
highbank: use scsi_init hook
Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Rob Herring <robh@kernel.org>
-rw-r--r--board/highbank/highbank.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 371b0a2..a1b6749 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -51,17 +51,23 @@ int board_eth_init(bd_t *bis)
return rc;
}
-#ifdef CONFIG_MISC_INIT_R
-int misc_init_r(void)
+#ifdef CONFIG_SCSI_AHCI_PLAT
+void scsi_init(void)
{
- char envbuffer[16];
- u32 boot_choice;
u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
if (reg & PWRDOM_STAT_SATA) {
ahci_init(HB_AHCI_BASE);
scsi_scan(1);
}
+}
+#endif
+
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+ char envbuffer[16];
+ u32 boot_choice;
boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
sprintf(envbuffer, "bootcmd%d", boot_choice);