summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorReinhard Arlt <reinhard.arlt@esd.eu>2011-11-10 08:51:57 +0000
committerWolfgang Denk <wd@denx.de>2012-03-18 20:10:02 +0100
commit2b224609568988a7d8db22d372b232a69155733f (patch)
tree5fd02b55006db675612b5d0607310f51e8655b7a /board
parent6e94125f9ccde8e7f8f94902b8d253bda5bb68c8 (diff)
downloadu-boot-imx-2b224609568988a7d8db22d372b232a69155733f.zip
u-boot-imx-2b224609568988a7d8db22d372b232a69155733f.tar.gz
u-boot-imx-2b224609568988a7d8db22d372b232a69155733f.tar.bz2
CPCI750: Add CPCI-HD/2 support
This patch adds support for the esd CPCI-HD/2 board to u-boot for CPCI-CPU/750. As the primary devices on the CPCI-HD/2 board are connected to device 1 and 3, the device must be swapped. Signed-off-by: Reinhard Arlt <reinhard.arlt@esd.eu>
Diffstat (limited to 'board')
-rw-r--r--board/esd/cpci750/ide.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c
index a3bd1b7..aa001df 100644
--- a/board/esd/cpci750/ide.c
+++ b/board/esd/cpci750/ide.c
@@ -31,6 +31,18 @@
#include <pci.h>
extern ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS];
+int cpci_hd_type;
+
+int ata_device(int dev)
+{
+ int retval;
+
+ retval = (dev & 1) << 4;
+ if (cpci_hd_type == 2)
+ retval ^= 1 << 4;
+ return retval;
+}
+
int ide_preinit (void)
{
@@ -39,14 +51,21 @@ int ide_preinit (void)
int l;
status = 1;
+ cpci_hd_type = 0;
if (CPCI750_SLAVE_TEST != 0)
return status;
for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) {
ide_bus_offset[l] = -ATA_STATUS;
}
devbusfn = pci_find_device (0x1103, 0x0004, 0);
- if (devbusfn == -1)
+ if (devbusfn != -1) {
+ cpci_hd_type = 1;
+ } else {
devbusfn = pci_find_device (0x1095, 0x3114, 0);
+ if (devbusfn != -1) {
+ cpci_hd_type = 2;
+ }
+ }
if (devbusfn != -1) {
ulong *ide_bus_offset_ptr;