summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-07-06 16:13:36 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 00:06:58 +0200
commit942e31437d2ba34acab259901b929532ba77390a (patch)
tree275f3be0420b80538edb2f794a9b52f50119bb20 /common
parente5a6c79d4299ca8367edb73656ad9e51765ccd66 (diff)
downloadu-boot-imx-942e31437d2ba34acab259901b929532ba77390a.zip
u-boot-imx-942e31437d2ba34acab259901b929532ba77390a.tar.gz
u-boot-imx-942e31437d2ba34acab259901b929532ba77390a.tar.bz2
scsi/ahci: add support for non-PCI controllers
Add support for AHCI controllers that are not PCI based. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_scsi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 8019ada..8e8e930 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -46,7 +46,7 @@
#define SCSI_VEND_ID 0x10b9
#define SCSI_DEV_ID 0x5288
-#else
+#elif !defined(CONFIG_SCSI_AHCI_PLAT)
#error no scsi device defined
#endif
@@ -174,7 +174,7 @@ removable:
scsi_curr_dev = -1;
}
-
+#ifdef CONFIG_PCI
void scsi_init(void)
{
int busdevfunc;
@@ -192,6 +192,7 @@ void scsi_init(void)
scsi_low_level_init(busdevfunc);
scsi_scan(1);
}
+#endif
block_dev_desc_t * scsi_get_dev(int dev)
{