Merge samsung, imx, tegra into u-boot-arm/master

[karo-tx-uboot.git] / include / pcmcia.h

diff --git a/include/pcmcia.h b/include/pcmcia.h
index 16653f35a116f2dd3702ca2cb7eb21c4d87f5689..0cc7f3ba54e27ca7eb70f4461fda6fab016240d4 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
@@ -31,8 +31,8 @@
  * 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 defined(CONFIG_CMD_PCMCIA) || \
+    (defined(CONFIG_CMD_IDE) && \
        (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )
 
 #if !defined(CONFIG_PCMCIA_SLOT_A) && !defined(CONFIG_PCMCIA_SLOT_B)
@@ -40,10 +40,10 @@
                                        /* 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
@@ -58,10 +58,14 @@
 # define CONFIG_PCMCIA_SLOT_B
 #elif defined(CONFIG_ICU862)           /* The ICU862 use SLOT_B        */
 # define CONFIG_PCMCIA_SLOT_B
-#elif defined(CONFIG_C2MON)            /* The C2MON  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
@@ -132,8 +136,8 @@ typedef struct {
  *     Common Memory Space
  */
 
-#define CFG_PCMCIA_PBR0                0xFE100000
-#define CFG_PCMCIA_POR0            (   PCMCIA_BSIZE_2  \
+#define CONFIG_SYS_PCMCIA_PBR0         0xFE100000
+#define CONFIG_SYS_PCMCIA_POR0     (   PCMCIA_BSIZE_2  \
                            |   PCMCIA_PPS_16   \
                            |   PCMCIA_PRS_MEM  \
                            |   PCMCIA_SLOT_x   \
@@ -147,8 +151,8 @@ typedef struct {
  *     Common Memory Space
  */
 
-#define CFG_PCMCIA_PBR1                0xFE100080
-#define CFG_PCMCIA_POR1            (   PCMCIA_BSIZE_8  \
+#define CONFIG_SYS_PCMCIA_PBR1         0xFE100080
+#define CONFIG_SYS_PCMCIA_POR1     (   PCMCIA_BSIZE_8  \
                            |   PCMCIA_PPS_8    \
                            |   PCMCIA_PRS_MEM  \
                            |   PCMCIA_SLOT_x   \
@@ -162,8 +166,8 @@ typedef struct {
  *     Common Memory Space
  */
 
-#define CFG_PCMCIA_PBR2                0xFE100100
-#define CFG_PCMCIA_POR2            (   PCMCIA_BSIZE_8  \
+#define CONFIG_SYS_PCMCIA_PBR2         0xFE100100
+#define CONFIG_SYS_PCMCIA_POR2     (   PCMCIA_BSIZE_8  \
                            |   PCMCIA_PPS_8    \
                            |   PCMCIA_PRS_MEM  \
                            |   PCMCIA_SLOT_x   \
@@ -173,8 +177,8 @@ typedef struct {
 /* Window 3:
  *     not used
  */
-#define CFG_PCMCIA_PBR3                0
-#define CFG_PCMCIA_POR3                0
+#define CONFIG_SYS_PCMCIA_PBR3         0
+#define CONFIG_SYS_PCMCIA_POR3         0
 
 /* Window 4:
  *     Base: 0xFE100C00        CS1
@@ -183,8 +187,8 @@ typedef struct {
  *     Common Memory Space
  */
 
-#define CFG_PCMCIA_PBR4                0xFE100C00
-#define CFG_PCMCIA_POR4            (   PCMCIA_BSIZE_2  \
+#define CONFIG_SYS_PCMCIA_PBR4         0xFE100C00
+#define CONFIG_SYS_PCMCIA_POR4     (   PCMCIA_BSIZE_2  \
                            |   PCMCIA_PPS_16   \
                            |   PCMCIA_PRS_MEM  \
                            |   PCMCIA_SLOT_x   \
@@ -198,8 +202,8 @@ typedef struct {
  *     Common Memory Space
  */
 
-#define CFG_PCMCIA_PBR5                0xFE100C80
-#define CFG_PCMCIA_POR5            (   PCMCIA_BSIZE_8  \
+#define CONFIG_SYS_PCMCIA_PBR5         0xFE100C80
+#define CONFIG_SYS_PCMCIA_POR5     (   PCMCIA_BSIZE_8  \
                            |   PCMCIA_PPS_8    \
                            |   PCMCIA_PRS_MEM  \
                            |   PCMCIA_SLOT_x   \
@@ -213,8 +217,8 @@ typedef struct {
  *     Common Memory Space
  */
 
-#define CFG_PCMCIA_PBR6                0xFE100D00
-#define CFG_PCMCIA_POR6            (   PCMCIA_BSIZE_8  \
+#define CONFIG_SYS_PCMCIA_PBR6         0xFE100D00
+#define CONFIG_SYS_PCMCIA_POR6     (   PCMCIA_BSIZE_8  \
                            |   PCMCIA_PPS_8    \
                            |   PCMCIA_PRS_MEM  \
                            |   PCMCIA_SLOT_x   \
@@ -224,8 +228,8 @@ typedef struct {
 /* Window 7:
  *     not used
  */
-#define CFG_PCMCIA_PBR7                0
-#define CFG_PCMCIA_POR7                0
+#define CONFIG_SYS_PCMCIA_PBR7         0
+#define CONFIG_SYS_PCMCIA_POR7         0
 
 /**********************************************************************/
 
@@ -300,6 +304,15 @@ typedef struct {
 #define CISTPL_IDE_HAS_INDEX   0x20
 #define CISTPL_IDE_IOIS16      0x40
 
-#endif /* CFG_CMD_PCMCIA || CFG_CMD_IDE && (CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT) */
+#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 */