Fix bug in PCMCIA configuration

diff --git a/include/config_IVML24.h b/include/config_IVML24.h
index f5ef3eb38a21085eb094317f501d49287381f625..6e573b717612086e6a55a6a5b8f313eda718c106 100644 (file)
--- 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 c4394b751c0f25d218edd86631e51e74ea145d5e..e806796d6369353714b0d697c7b72959627cc397 100644 (file)
--- 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 f941b38c4a6028569608a8dd124fd4614f897bf6..be042c350ae011297671f6d44f62e4aeadfa25dd 100644 (file)
--- 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 3f8dfa6019a8b56988b1aab58f2afb8e330e2610..2172b719eaaf24234cfad3b72a91e29f8c40fec9 100644 (file)
--- 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 */