summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDave Liu <r63238@freescale.com>2008-03-26 22:47:06 +0800
committerWolfgang Denk <wd@denx.de>2008-03-26 23:38:48 +0100
commit9eef62804d9695425b24c87b46a61a7fa74afee0 (patch)
tree42b85b0df83c0bb1edd06fd0f7cd3e98200003f4 /include
parent5b5eb9ca5b778f763bcf332697b35cc1e747626e (diff)
ata: merge the ata_piix driver
move the cmd_sata.c from common/ to drivers/ata_piix.c, the cmd_sata.c have some part of ata_piix controller drivers. consolidate the driver to have better framework. Signed-off-by: Dave Liu <daveliu@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/sc520_cdp.h1
-rw-r--r--include/sata.h16
2 files changed, 0 insertions, 17 deletions
diff --git a/include/configs/sc520_cdp.h b/include/configs/sc520_cdp.h
index 8491d97ae..58d656cbf 100644
--- a/include/configs/sc520_cdp.h
+++ b/include/configs/sc520_cdp.h
@@ -192,7 +192,6 @@
/************************************************************
*SATA/Native Stuff
************************************************************/
-#define CFG_SATA_SUPPORTED 1
#define CFG_SATA_MAXBUS 2 /*Max Sata buses supported */
#define CFG_SATA_DEVS_PER_BUS 2 /*Max no. of devices per bus/port */
#define CFG_SATA_MAXDEVICES (CFG_SATA_MAXBUS* CFG_SATA_DEVS_PER_BUS)
diff --git a/include/sata.h b/include/sata.h
index 165b471b2..bb1acb387 100644
--- a/include/sata.h
+++ b/include/sata.h
@@ -77,32 +77,16 @@ u8 sata_chk_status (struct sata_ioports *ioaddr);
ulong sata_read (int device, ulong blknr,lbaint_t blkcnt, void * buffer);
ulong sata_write (int device,ulong blknr, lbaint_t blkcnt, void * buffer);
void msleep (int count);
-#else
-extern int sata_bus_softreset (int num);
-extern void sata_identify (int num, int dev);
-extern void sata_port (struct sata_ioports *ioport);
-extern void set_Feature_cmd (int num, int dev);
-extern ulong sata_read (int device, ulong blknr,
- lbaint_t blkcnt, void * buffer);
-extern ulong sata_write (int device, ulong blknr,
- lbaint_t blkcnt, void * buffer);
-extern void msleep (int count);
#endif
/************DRIVER SPECIFIC DEFINITIONS AND DECLARATIONS**************/
#ifdef DRV_DECL /*Driver specific declaration */
int init_sata (void);
-#else
-extern int init_sata (void);
#endif
#ifdef DRV_DECL /*Defines Driver Specific variables */
struct sata_port port[CFG_SATA_MAXBUS];
block_dev_desc_t sata_dev_desc[CFG_SATA_MAXDEVICES];
int curr_dev = -1;
-#else
-extern struct sata_port port[CFG_SATA_MAXBUS];
-extern block_dev_desc_t sata_dev_desc[CFG_SATA_MAXDEVICES];
-extern int curr_dev;
#endif