powerpc, 8xx: remove support for 8xx

[oweals/u-boot.git] / include / pcmcia.h

diff --git a/include/pcmcia.h b/include/pcmcia.h
index ce8c8ed5e91857b013f9d65c4bfb94340127dced..94b54c210dfe5143cdda8cfd71c78ea0aca8424e 100644 (file)
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -15,45 +15,10 @@
  * Allow configuration to select PCMCIA slot,
  * or try to generate a useful default
  */
-#if defined(CONFIG_CMD_PCMCIA) || \
-    (defined(CONFIG_CMD_IDE) && \
-       (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
+#if defined(CONFIG_CMD_PCMCIA)
 
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
-
-                                       /* 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 uses SLOT_A   */
-# define CONFIG_PCMCIA_SLOT_A
-#elif defined(CONFIG_FADS)             /* The FADS series are a mess   */
-# if defined(CONFIG_MPC86x) || defined(CONFIG_MPC821)
-#  define CONFIG_PCMCIA_SLOT_A
-# else
-#  define CONFIG_PCMCIA_SLOT_B
-# endif
-#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
-#elif defined(CONFIG_IVMS8) || defined(CONFIG_IVML24)  /* The IVM* use SLOT_A  */
-# define CONFIG_PCMCIA_SLOT_A
-#elif defined(CONFIG_LWMON)            /* The LWMON  use SLOT_B        */
-# define CONFIG_PCMCIA_SLOT_B
-#elif defined(CONFIG_ICU862)           /* The ICU862 use SLOT_B        */
-# 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
-#elif defined(CONFIG_UC100)            /* The UC100 use SLOT_B         */
-# define CONFIG_PCMCIA_SLOT_B
-#else
 # error "PCMCIA Slot not configured"
-#endif
-
 #endif /* !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B) */
 
 /* Make sure exactly one slot is defined - we support only one for now */
@@ -83,17 +48,6 @@
 # define PCMCIA_SLOT_x         PCMCIA_PSLOT_B
 #endif
 
-/*
- * The TQM850L hardware has two pins swapped! Grrrrgh!
- */
-#ifdef CONFIG_TQM850L
-#define __MY_PCMCIA_GCRX_CXRESET       PCMCIA_GCRX_CXOE
-#define __MY_PCMCIA_GCRX_CXOE          PCMCIA_GCRX_CXRESET
-#else
-#define __MY_PCMCIA_GCRX_CXRESET       PCMCIA_GCRX_CXRESET
-#define __MY_PCMCIA_GCRX_CXOE          PCMCIA_GCRX_CXOE
-#endif
-
 /*
  * This structure is used to address each window in the PCMCIA controller.
  *
@@ -290,13 +244,4 @@ typedef struct {
 
 #endif
 
-#ifdef CONFIG_8xx
-extern u_int *pcmcia_pgcrx[];
-#define        PCMCIA_PGCRX(slot)      (*pcmcia_pgcrx[slot])
-#endif
-
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
-extern int check_ide_device(int slot);
-#endif
-
 #endif /* _PCMCIA_H */