summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Herrmann <morpheus.ibis@gmail.com>2012-10-07 05:56:05 +0000
committerTom Rini <trini@ti.com>2012-10-17 07:59:08 -0700
commit94fa029a6d1fcf58c4cecc46326f766425bdb918 (patch)
treeaadf7b598fcee92e8ba5a07147d2f1db70291663
parenteb1f09e0078668d831bd97eab3557786ea2d956d (diff)
downloadu-boot-imx-94fa029a6d1fcf58c4cecc46326f766425bdb918.zip
u-boot-imx-94fa029a6d1fcf58c4cecc46326f766425bdb918.tar.gz
u-boot-imx-94fa029a6d1fcf58c4cecc46326f766425bdb918.tar.bz2
remove CONFIG_SC3 from cmd_ide.c
There is no difference in codepath with CONFIG_SC3 enabled, so just remove it Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com>
-rw-r--r--common/cmd_ide.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index bae7767..11e9eac 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -400,9 +400,6 @@ void ide_init(void)
unsigned char c;
int i, bus;
-#if defined(CONFIG_SC3)
- unsigned int ata_reset_time = ATA_RESET_TIME;
-#endif
#ifdef CONFIG_IDE_8xx_PCCARD
extern int pcmcia_on(void);
extern int ide_devices_found; /* Initialized in check_ide_device() */
@@ -502,11 +499,7 @@ void ide_init(void)
c = ide_inb(dev, ATA_STATUS);
i++;
-#if defined(CONFIG_SC3)
- if (i > (ata_reset_time * 100)) {
-#else
if (i > (ATA_RESET_TIME * 100)) {
-#endif
puts("** Timeout **\n");
/* LED's off */
ide_led((LED_IDE1 | LED_IDE2), 0);