highbank: use scsi_init hook
authorIan Campbell <ijc@hellion.org.uk>
Fri, 7 Mar 2014 01:20:57 +0000 (01:20 +0000)
committerTom Rini <trini@ti.com>
Mon, 10 Mar 2014 17:50:31 +0000 (13:50 -0400)
Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Acked-by: Rob Herring <robh@kernel.org>
board/highbank/highbank.c

index 371b0a2b168b79a733230319034855f2258b946b..a1b67494f6c526d6659a75f460c050d58f196978 100644 (file)
@@ -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);