summaryrefslogtreecommitdiff
path: root/include/pcmcia.h
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2017-06-07 17:33:09 +0200
committerTom Rini <trini@konsulko.com>2017-06-12 08:37:55 -0400
commit5b8e76c35ec312a3f73126bd1a2d2c0965b98a9f (patch)
tree58d5c3c3b0baaeb369f8e426f64621b0f9ad9e4b /include/pcmcia.h
parent4a30a93929c112af94b8e00db1382432a69d0809 (diff)
powerpc, 8xx: remove support for 8xx
There was for long time no activity in the 8xx area. We need to go further and convert to Kconfig, but it turned out, nobody is interested anymore in 8xx, so remove it (with a heavy heart, knowing that I remove here the root of U-Boot). Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'include/pcmcia.h')
-rw-r--r--include/pcmcia.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h
index aaaf6511a8..94b54c210d 100644
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -15,18 +15,10 @@
* Allow configuration to select PCMCIA slot,
* or try to generate a useful default
*/
-#if defined(CONFIG_CMD_PCMCIA) || \
- (defined(CONFIG_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)
-
-#if defined(CONFIG_TQM8xxL)
-# define CONFIG_PCMCIA_SLOT_B /* The TQM8xxL use 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 */
@@ -57,17 +49,6 @@
#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.
*
* Keep in mind that we assume that pcmcia_win_t[n+1] is mapped directly
@@ -263,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_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
-extern int check_ide_device(int slot);
-#endif
-
#endif /* _PCMCIA_H */