From: wdenk <wdenk>
Date: Mon, 22 Jan 2001 10:15:10 +0000 (+0000)
Subject: Fix bug in PCMCIA configuration
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7fcb48d5e14f6b65ad9b4cfaf7f6181b74aab7d8;p=users%2Frw%2Fppcboot.git

Fix bug in PCMCIA configuration
---

diff --git a/include/config_IVML24.h b/include/config_IVML24.h
index f5ef3eb..6e573b7 100644
--- a/include/config_IVML24.h
+++ b/include/config_IVML24.h
@@ -88,6 +88,7 @@
 #define	CFG_PIO_MODE		0	/* IDE interface in PIO Mode 0	*/
 
 #define CFG_PB_12V_ENABLE	0x00002000		/* PB 18	*/
+#define CFG_PB_ILOCK_SWITCH	0x00004000		/* PB 17	*/
 #define CFG_PB_SDRAM_CLKE	0x00008000		/* PB 16	*/
 #define CFG_PB_ETH_POWERDOWN	0x00010000		/* PB 15	*/
 #define CFG_PB_IDE_MOTOR	0x00020000		/* PB 14	*/
diff --git a/include/config_TQM823L.h b/include/config_TQM823L.h
index c4394b7..e806796 100644
--- a/include/config_TQM823L.h
+++ b/include/config_TQM823L.h
@@ -255,7 +255,6 @@
 #define CFG_IDE_MAXDEVICE	1	/* max. 1 drive per IDE bus	*/
 
 #define CFG_ATA_IDE0_OFFSET	0x0000
-#define CFG_ATA_IDE1_OFFSET	0x0C00
 
 #define CFG_ATA_BASE_ADDR	CFG_PCMCIA_MEM_ADDR
 
diff --git a/include/config_TQM860L.h b/include/config_TQM860L.h
index f941b38..be042c3 100644
--- a/include/config_TQM860L.h
+++ b/include/config_TQM860L.h
@@ -253,7 +253,6 @@
 #define CFG_IDE_MAXDEVICE	1	/* max. 1 drive per IDE bus	*/
 
 #define CFG_ATA_IDE0_OFFSET	0x0000
-#define CFG_ATA_IDE1_OFFSET	0x0C00
 
 #define CFG_ATA_BASE_ADDR	CFG_PCMCIA_MEM_ADDR
 
diff --git a/include/pcmcia.h b/include/pcmcia.h
index 3f8dfa6..2172b71 100644
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -31,7 +31,9 @@
  * Allow configuration to select PCMCIA slot,
  * or try to generate a useful default
  */
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || (CONFIG_COMMANDS & CFG_CMD_IDE)
+#if ( CONFIG_COMMANDS & CFG_CMD_PCMCIA) || \
+    ((CONFIG_COMMANDS & CFG_CMD_IDE) && \
+	(defined(CONFIG_IDE_PCCARD) || defined(CONFIG_IDE_PCMCIA) ) )
 
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
 
@@ -60,8 +62,6 @@
 
 #endif /* !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) */
 
-#endif	/* CFG_CMD_PCMCIA || CFG_CMD_IDE */
-
 /* Make sure exactly one slot is defined - we support only one for now */
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
 #error Neither CONFIG_PCMCIA_SLOT_A nor CONFIG_PCMCIA_SLOT_B configured
@@ -290,4 +290,6 @@ typedef struct {
 #define CISTPL_IDE_HAS_INDEX	0x20
 #define CISTPL_IDE_IOIS16	0x40
 
+#endif	/* CFG_CMD_PCMCIA || CFG_CMD_IDE&&(CONFIG_IDE_PCCARD||CONFIG_IDE_PCMCIA) */
+
 #endif /* _PCMCIA_H */