From 6069ff265362ef6239749b5f598b137f407b821e Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Fri, 28 Feb 2003 00:49:47 +0000
Subject: * Add support for 16 MB flash configuration of TRAB board

* Patch by Erwin Rol, 27 Feb 2003:
  Add support for RTEMS

* Add image information to README

* Fix dual PCMCIA slot support (when running with just one
  slot populated)

* Add VFD type detection to trab board

* extend drivers/cs8900.c driver to synchronize  ethaddr  environment
  variable with value in the EEPROM

* Start adding MIPS support files
---
 common/cmd_ide.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'common/cmd_ide.c')

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index d082d5e9b3..94fc89b427 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -489,11 +489,14 @@ void ide_init (void)
 
 #ifdef CONFIG_IDE_8xx_PCCARD
 	extern int pcmcia_on (void);
+	extern int ide_devices_found; /* Initialized in check_ide_device() */
 
 	WATCHDOG_RESET();
 
+	ide_devices_found = 0;
 	/* initialize the PCMCIA IDE adapter card */
-	if (pcmcia_on())
+	pcmcia_on();
+	if (!ide_devices_found)
 		return;
 	udelay (1000000);	/* 1 s */
 #endif	/* CONFIG_IDE_8xx_PCCARD */
@@ -550,6 +553,13 @@ void ide_init (void)
 		int dev = bus * (CFG_IDE_MAXDEVICE / max_bus_scan);
 #endif
 
+#ifdef CONFIG_IDE_8xx_PCCARD
+		/* Skip non-ide devices from probing */
+		if ((ide_devices_found & (1 << bus)) == 0) {
+			ide_led ((LED_IDE1 | LED_IDE2), 0); /* LED's off */
+			continue;
+		}
+#endif
 		printf ("Bus %d: ", bus);
 
 		ide_bus_ok[bus] = 0;
-- 
cgit