summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorGerald Van Baren <vanbaren@cideas.com>2007-04-14 23:02:21 -0400
committerGerald Van Baren <vanbaren@cideas.com>2007-04-14 23:02:21 -0400
commit6f1d57c567824b7e525ea36f972b662d67382f73 (patch)
tree0a6f9aaf0b86e4cbab8cace70e648a61cf6a014b /common
parentc28abb9c614f65ce2096cc4a66fc886c77d0e5a4 (diff)
parent8048cdd56f04a756eeea4951f402bf5cc33785db (diff)
downloadu-boot-imx-6f1d57c567824b7e525ea36f972b662d67382f73.zip
u-boot-imx-6f1d57c567824b7e525ea36f972b662d67382f73.tar.gz
u-boot-imx-6f1d57c567824b7e525ea36f972b662d67382f73.tar.bz2
Merge git://www.denx.de/git/u-boot into fdt-cmd
Diffstat (limited to 'common')
-rw-r--r--common/cmd_ide.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 2e185cc..b4119f3 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -513,9 +513,11 @@ void ide_init (void)
#endif
unsigned char c;
int i, bus;
+#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
+ unsigned int ata_reset_time;
+#endif
#ifdef CONFIG_AMIGAONEG3SE
unsigned int max_bus_scan;
- unsigned int ata_reset_time;
char *s;
#endif
#ifdef CONFIG_IDE_8xx_PCCARD
@@ -617,10 +619,9 @@ void ide_init (void)
udelay (100000); /* 100 ms */
ide_outb (dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
udelay (100000); /* 100 ms */
-#ifdef CONFIG_AMIGAONEG3SE
- ata_reset_time = ATA_RESET_TIME;
- s = getenv("ide_reset_timeout");
- if (s) ata_reset_time = 2*simple_strtol(s, NULL, 10);
+#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
+ if ((s = getenv("ide_reset_timeout")) != NULL)
+ ata_reset_time = simple_strtol(s, NULL, 10);
#endif
i = 0;
do {
@@ -628,7 +629,7 @@ void ide_init (void)
c = ide_inb (dev, ATA_STATUS);
i++;
-#ifdef CONFIG_AMIGAONEG3SE
+#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
if (i > (ata_reset_time * 100)) {
#else
if (i > (ATA_RESET_TIME * 100)) {