From: Ian Campbell <ijc@hellion.org.uk>
Date: Fri, 7 Mar 2014 01:20:57 +0000 (+0000)
Subject: highbank: use scsi_init hook
X-Git-Tag: v2014.04-rc2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b946322670ca8eda2d41c854a00a863076df6446;p=u-boot

highbank: use scsi_init hook

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Acked-by: Rob Herring <robh@kernel.org>
---

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 371b0a2b16..a1b67494f6 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);