powerpc/mpc85xx: Add B4860 and variant SoCs

[u-boot] / drivers / block / sata_sil3114.c

diff --git a/drivers/block/sata_sil3114.c b/drivers/block/sata_sil3114.c
index 1e60636ec20fde13f30b951669b719ecf8593a46..3a5e0328f5d9a0319116ded17da75d5122b00ec0 100644 (file)
--- a/drivers/block/sata_sil3114.c
+++ b/drivers/block/sata_sil3114.c
@@ -28,6 +28,7 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <ide.h>
+#include <sata.h>
 #include <libata.h>
 #include "sata_sil3114.h"
 
@@ -48,7 +49,6 @@ static u8 sata_chk_status (struct sata_ioports *ioaddr, u8 usealtstatus);
 static void msleep (int count);
 
 static u32 iobase[6] = { 0, 0, 0, 0, 0, 0};    /* PCI BAR registers for device */
-extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 
 static struct sata_port port[CONFIG_SYS_SATA_MAX_DEVICE];
 
@@ -782,6 +782,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH0) | ATA_PCI_CTL_OFS;
                port[0].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH0;
                break;
+#if (CONFIG_SYS_SATA_MAX_DEVICE >= 1)
        case 1:
                port[1].port_no = 0;
                port[1].ioaddr.cmd_addr = iobase[5] + VND_TF0_CH1;
@@ -789,6 +790,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH1) | ATA_PCI_CTL_OFS;
                port[1].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH1;
                break;
+#elif (CONFIG_SYS_SATA_MAX_DEVICE >= 2)
        case 2:
                port[2].port_no = 0;
                port[2].ioaddr.cmd_addr = iobase[5] + VND_TF0_CH2;
@@ -796,6 +798,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH2) | ATA_PCI_CTL_OFS;
                port[2].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH2;
                break;
+#elif (CONFIG_SYS_SATA_MAX_DEVICE >= 3)
        case 3:
                port[3].port_no = 0;
                port[3].ioaddr.cmd_addr = iobase[5] + VND_TF0_CH3;
@@ -803,6 +806,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH3) | ATA_PCI_CTL_OFS;
                port[3].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH3;
                break;
+#endif
        default:
                printf ("Tried to scan unknown port: ata%d\n", dev);
                return 1;