Merge branch 'next' of ../custodians into next

[u-boot] / drivers / pcmcia / mpc8xx_pcmcia.c

diff --git a/drivers/pcmcia/mpc8xx_pcmcia.c b/drivers/pcmcia/mpc8xx_pcmcia.c
index 95ea5e999f518b6e0918613842b18ab1b07c1188..74a50f1c74737602206a95e7d5100631f30cdbb0 100644 (file)
--- a/drivers/pcmcia/mpc8xx_pcmcia.c
+++ b/drivers/pcmcia/mpc8xx_pcmcia.c
@@ -1,7 +1,5 @@
 #include <common.h>
-#if defined(CONFIG_8xx)
 #include <mpc8xx.h>
-#endif
 #include <pcmcia.h>
 
 #undef CONFIG_PCMCIA
@@ -14,7 +12,7 @@
 #define        CONFIG_PCMCIA
 #endif
 
-#if defined(CONFIG_8xx)        && defined(CONFIG_PCMCIA)
+#if defined(CONFIG_PCMCIA)
 
 #if    defined(CONFIG_IDE_8xx_PCCARD)
 extern int check_ide_device (int slot);
@@ -59,12 +57,6 @@ static const u_int m8xx_size_to_gray[M8XX_SIZES_NO] =
 
 /* -------------------------------------------------------------------- */
 
-#ifdef CONFIG_HMI10
-#define        HMI10_FRAM_TIMING       (       PCMCIA_SHT(2)   \
-                               |       PCMCIA_SST(2)   \
-                               |       PCMCIA_SL(4))
-#endif
-
 #if    defined(CONFIG_LWMON) || defined(CONFIG_NSCU)
 #define        CONFIG_SYS_PCMCIA_TIMING        (       PCMCIA_SHT(9)   \
                                |       PCMCIA_SST(3)   \
@@ -108,17 +100,6 @@ int pcmcia_on (void)
                switch (i) {
 #ifdef CONFIG_IDE_8xx_PCCARD
                case 4:
-#ifdef CONFIG_HMI10
-               {       /* map FRAM area */
-                       win->or = (     PCMCIA_BSIZE_256K
-                               |       PCMCIA_PPS_8
-                               |       PCMCIA_PRS_ATTR
-                               |       slotbit
-                               |       PCMCIA_PV
-                               |       HMI10_FRAM_TIMING );
-                       break;
-               }
-#endif
                case 0: {       /* map attribute memory */
                        win->or = (     PCMCIA_BSIZE_64M
                                |       PCMCIA_PPS_8
@@ -149,18 +130,6 @@ int pcmcia_on (void)
                        break;
                }
 #endif /* CONFIG_IDE_8xx_PCCARD */
-#ifdef CONFIG_HMI10
-               case 3: {       /* map I/O window for 4xUART data/ctrl */
-                       win->br += 0x40000;
-                       win->or = (     PCMCIA_BSIZE_256K
-                               |       PCMCIA_PPS_8
-                               |       PCMCIA_PRS_IO
-                               |       slotbit
-                               |       PCMCIA_PV
-                               |       CONFIG_SYS_PCMCIA_TIMING );
-                       break;
-               }
-#endif /* CONFIG_HMI10 */
                default:        /* set to not valid */
                        win->or = 0;
                        break;
@@ -301,4 +270,4 @@ static u_int m8xx_get_speed(u_int ns, u_int is_io)
 }
 #endif /* 0 */
 
-#endif /* CONFIG_8xx && CONFIG_PCMCIA */
+#endif /* CONFIG_PCMCIA */