Blackfin: make default ADI env more flexible

[u-boot] / board / gth / pcmcia.c

diff --git a/board/gth/pcmcia.c b/board/gth/pcmcia.c
index fce5492635ebcf4cf8f47879871381fbb614669b..a4db16d0cedc0e429d30984169c199f317ea8731 100644 (file)
--- a/board/gth/pcmcia.c
+++ b/board/gth/pcmcia.c
@@ -4,11 +4,11 @@
 
 #undef CONFIG_PCMCIA
 
-#if    (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 #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
 
@@ -31,10 +31,10 @@ int pcmcia_hardware_enable (int slot)
 
        debug ("hardware_enable: GTH Slot %c\n", 'A' + slot);
 
-       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_);
@@ -83,7 +83,7 @@ int pcmcia_hardware_enable (int slot)
 
        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 */