imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / mbx8xx / pcmcia.c

diff --git a/board/mbx8xx/pcmcia.c b/board/mbx8xx/pcmcia.c
index 132a68806d89e39be2a5269faadcbf8f5f874354..69368d87501614798dde2e4b46127f6420c40cb4 100755 (executable)
--- a/board/mbx8xx/pcmcia.c
+++ b/board/mbx8xx/pcmcia.c
@@ -6,11 +6,11 @@
 
 #undef CONFIG_PCMCIA
 
 
 #undef CONFIG_PCMCIA
 

-#if    (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)

 #define        CONFIG_PCMCIA
 #endif
 
 #define        CONFIG_PCMCIA
 #endif
 

-#if    (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)

 #define        CONFIG_PCMCIA
 #endif
 
 #define        CONFIG_PCMCIA
 #endif
 


@@ -88,10 +88,10 @@ int pcmcia_hardware_enable (int slot)
 
        udelay (10000);
 
 
        udelay (10000);
 

-       immap = (immap_t *) CFG_IMMR;
-       sysp = (sysconf8xx_t *) (&(((immap_t *) CFG_IMMR)->im_siu_conf));
-       pcmp = (pcmconf8xx_t *) (&(((immap_t *) CFG_IMMR)->im_pcmcia));
-       cp = (cpm8xx_t *) (&(((immap_t *) CFG_IMMR)->im_cpm));
+       immap = (immap_t *) CONFIG_SYS_IMMR;
+       sysp = (sysconf8xx_t *) (&(((immap_t *) CONFIG_SYS_IMMR)->im_siu_conf));
+       pcmp = (pcmconf8xx_t *) (&(((immap_t *) CONFIG_SYS_IMMR)->im_pcmcia));
+       cp = (cpm8xx_t *) (&(((immap_t *) CONFIG_SYS_IMMR)->im_cpm));

 
        /* clear interrupt state, and disable interrupts */
        pcmp->pcmc_pscr = PCMCIA_MASK (_slot_);
 
        /* clear interrupt state, and disable interrupts */
        pcmp->pcmc_pscr = PCMCIA_MASK (_slot_);


@@ -156,11 +156,11 @@ int pcmcia_hardware_enable (int slot)
        return (0);
        }
 
        return (0);
        }
 

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)

 int pcmcia_hardware_disable (int slot)
 {
        return 0;       /* No hardware to disable */
 }
 int pcmcia_hardware_disable (int slot)
 {
        return 0;       /* No hardware to disable */
 }

-#endif /* CFG_CMD_PCMCIA */
+#endif

 
 #endif /* CONFIG_PCMCIA */
 
 #endif /* CONFIG_PCMCIA */