From: tang yuantian Date: Fri, 20 Mar 2015 02:27:54 +0000 (+0800) Subject: cmd_scsi: Enable SoC AHCI device on platforms with PCI X-Git-Tag: v2015.07-rc1~100 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1a1cf6ee47409d44573de3adbcabd2d0f5520cad;p=u-boot cmd_scsi: Enable SoC AHCI device on platforms with PCI Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file. Signed-off-by: Shaohui Xie Signed-off-by: Tang Yuantian Reviewed-by: Bin Meng Reviewed-by: Tom Rini --- diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index a0a62ebdca..f80f549d4e 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -37,7 +37,7 @@ #define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #endif -#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST }; #endif static ccb tempccb; /* temporary scsi command buffer */ @@ -179,7 +179,7 @@ int scsi_get_disk_count(void) return scsi_max_devs; } -#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) void scsi_init(void) { int busdevfunc;