From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Herrmann Date: Sun, 7 Oct 2012 17:56:05 +0200 Subject: [U-Boot] [PATCH 01/10] remove CONFIG_SC3 from cmd_ide.c In-Reply-To: <1349625374-12391-1-git-send-email-morpheus.ibis@gmail.com> References: <1349625374-12391-1-git-send-email-morpheus.ibis@gmail.com> Message-ID: <1349625374-12391-2-git-send-email-morpheus.ibis@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de There is no difference in codepath with CONFIG_SC3 enabled, so just remove it Signed-off-by: Pavel Herrmann --- common/cmd_ide.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 6e1e568..4b94e23 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); -- 1.7.12