Add support for CATcenter board (based on PPChameleon ME module)

[u-boot] / include / pcmcia.h

diff --git a/include/pcmcia.h b/include/pcmcia.h
index ee2c63c978fb2c8758d55ff72b734ac8f5bc35c9..af56e6d1b7854a1fd702b5bf5698ac95b461ca26 100644 (file)
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -40,15 +40,15 @@
                                        /* The RPX series use SLOT_B    */
 #if defined(CONFIG_RPXCLASSIC) || defined(CONFIG_RPXLITE)
 # define CONFIG_PCMCIA_SLOT_B
-#elif defined(CONFIG_ADS)              /* The ADS  board use SLOT_A    */
+#elif defined(CONFIG_ADS)              /* The ADS  board uses SLOT_A   */
 # define CONFIG_PCMCIA_SLOT_A
 #elif defined(CONFIG_FADS)             /* The FADS series are a mess   */
-# if defined(CONFIG_MPC860T) || defined(CONFIG_MPC860) || defined(CONFIG_MPC821)
+# if defined(CONFIG_MPC86x) || defined(CONFIG_MPC821)
 #  define CONFIG_PCMCIA_SLOT_A
 # else
 #  define CONFIG_PCMCIA_SLOT_B
 # endif
-#elif defined(CONFIG_TQM8xxL)
+#elif defined(CONFIG_TQM8xxL) || defined(CONFIG_SVM_SC8xx)
 # define       CONFIG_PCMCIA_SLOT_B    /* The TQM8xxL use SLOT_B       */
 #elif defined(CONFIG_SPD823TS)         /* The SPD8xx  use SLOT_B       */
 # define CONFIG_PCMCIA_SLOT_B
@@ -62,6 +62,10 @@
 # define CONFIG_PCMCIA_SLOT_B
 #elif defined(CONFIG_R360MPI)          /* The R360MPI use SLOT_B       */
 # define CONFIG_PCMCIA_SLOT_B
+#elif defined(CONFIG_ATC)              /* The ATC use SLOT_A   */
+# define CONFIG_PCMCIA_SLOT_A
+#elif defined(CONFIG_NETTA)
+# define CONFIG_PCMCIA_SLOT_A
 #else
 # error "PCMCIA Slot not configured"
 #endif
@@ -76,8 +80,12 @@
 #error Both CONFIG_PCMCIA_SLOT_A and CONFIG_PCMCIA_SLOT_B configured
 #endif
 
+#ifndef PCMCIA_SOCKETS_NO
 #define PCMCIA_SOCKETS_NO      1
+#endif
+#ifndef PCMCIA_MEM_WIN_NO
 #define PCMCIA_MEM_WIN_NO      4
+#endif
 #define PCMCIA_IO_WIN_NO       2
 
 /* define _slot_ to be able to optimize macros */