From mboxrd@z Thu Jan  1 00:00:00 1970
From: ito at mlb.co.jp <ito@mlb.co.jp>
Date: Wed, 05 Apr 2006 23:04:12 +0900 (JST)
Subject: [U-Boot-Users] [patch] Support IDE secondary disk without primary disk.
Message-ID: <20060405.230412.71089200.ito@mlb.co.jp>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hello

Current u-boot does not search disks on secondary port if there is no disks
on primary port.

this patch fixes this problem.

Signed-off-by: Hiroshi Ito <ito@mlb.co.jp>

CHANGELOG:

* Support IDE secondary disk without primary disk.
  Patch by Hiroshi Ito, 5 Apr 2006
-------------- next part --------------
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 41621ba..f37aa07 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -617,10 +617,11 @@ void ide_init (void)
 		if (s) ata_reset_time = 2*simple_strtol(s, NULL, 10);
 #endif
 		i = 0;
-		do {
+		for (;;) {
 			udelay (10000);		/* 10 ms */
 
 			c = ide_inb (dev, ATA_STATUS);
+			if (!(c & ATA_STAT_BUSY)) break;
 			i++;
 #ifdef CONFIG_AMIGAONEG3SE
 			if (i > (ata_reset_time * 100)) {
@@ -636,12 +637,12 @@ void ide_init (void)
 					goto skip_bus;
 				}
 #endif
-				return;
+				break;
 			}
 			if ((i >= 100) && ((i%100)==0)) {
 				putc ('.');
 			}
-		} while (c & ATA_STAT_BUSY);
+		}
 
 		if (c & (ATA_STAT_BUSY | ATA_STAT_FAULT)) {
 			puts ("not available  ");