On Fri, Mar 20, 2015 at 10:27 AM, Tang Yuantian <yuantian.t...@freescale.com> wrote: > 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 <shaohui....@freescale.com> > Signed-off-by: Tang Yuantian <yuantian.t...@freescale.com> > --- > common/cmd_scsi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c > index a0a62eb..f80f549 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; > --
Reviewed-by: Bin Meng <bmeng...@gmail.com> _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot