rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / include / asm-ppc / iopin_8xx.h

diff --git a/include/asm-ppc/iopin_8xx.h b/include/asm-ppc/iopin_8xx.h
index 1946eb2..3a2a682 100644 (file)
--- a/include/asm-ppc/iopin_8xx.h
+++ b/include/asm-ppc/iopin_8xx.h
@@ -46,16 +46,16 @@ extern __inline__ void
 iopin_set_high(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padat;
                *datp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *datp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdat;
+               volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdat;
                *datp |= (1 << (31 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdat;
                *datp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddat;
                *datp |= (1 << (15 - iopin->pin));
        }
 }
@@ -64,16 +64,16 @@ extern __inline__ void
 iopin_set_low(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padat;
                *datp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *datp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdat;
+               volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdat;
                *datp &= ~(1 << (31 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdat;
                *datp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddat;
                *datp &= ~(1 << (15 - iopin->pin));
        }
 }
@@ -82,16 +82,16 @@ extern __inline__ uint
 iopin_is_high(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padat;
                return (*datp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *datp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdat;
+               volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdat;
                return (*datp >> (31 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdat;
                return (*datp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddat;
                return (*datp >> (15 - iopin->pin)) & 1;
        }
        return 0;
@@ -101,16 +101,16 @@ extern __inline__ uint
 iopin_is_low(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padat;
                return ((*datp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *datp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdat;
+               volatile uint *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdat;
                return ((*datp >> (31 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdat;
                return ((*datp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *datp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddat;
+               volatile ushort *datp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddat;
                return ((*datp >> (15 - iopin->pin)) & 1) ^ 1;
        }
        return 0;
@@ -120,16 +120,16 @@ extern __inline__ void
 iopin_set_out(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padir;
                *dirp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *dirp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdir;
+               volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdir;
                *dirp |= (1 << (31 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdir;
                *dirp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddir;
                *dirp |= (1 << (15 - iopin->pin));
        }
 }
@@ -138,16 +138,16 @@ extern __inline__ void
 iopin_set_in(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padir;
                *dirp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *dirp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdir;
+               volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdir;
                *dirp &= ~(1 << (31 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdir;
                *dirp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddir;
                *dirp &= ~(1 << (15 - iopin->pin));
        }
 }
@@ -156,16 +156,16 @@ extern __inline__ uint
 iopin_is_out(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padir;
                return (*dirp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *dirp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdir;
+               volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdir;
                return (*dirp >> (31 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdir;
                return (*dirp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddir;
                return (*dirp >> (15 - iopin->pin)) & 1;
        }
        return 0;
@@ -175,16 +175,16 @@ extern __inline__ uint
 iopin_is_in(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_padir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_padir;
                return ((*dirp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *dirp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbdir;
+               volatile uint *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbdir;
                return ((*dirp >> (31 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcdir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcdir;
                return ((*dirp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *dirp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pddir;
+               volatile ushort *dirp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pddir;
                return ((*dirp >> (15 - iopin->pin)) & 1) ^ 1;
        }
        return 0;
@@ -194,10 +194,10 @@ extern __inline__ void
 iopin_set_odr(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_ioport.iop_paodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_paodr;
                *odrp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbodr;
                *odrp |= (1 << (31 - iopin->pin));
        }
 }
@@ -206,10 +206,10 @@ extern __inline__ void
 iopin_set_act(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_ioport.iop_paodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_paodr;
                *odrp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbodr;
                *odrp &= ~(1 << (31 - iopin->pin));
        }
 }
@@ -218,10 +218,10 @@ extern __inline__ uint
 iopin_is_odr(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_ioport.iop_paodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_paodr;
                return (*odrp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbodr;
                return (*odrp >> (31 - iopin->pin)) & 1;
        }
        return 0;
@@ -231,10 +231,10 @@ extern __inline__ uint
 iopin_is_act(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_ioport.iop_paodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_paodr;
                return ((*odrp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile ushort *odrp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbodr;
+               volatile ushort *odrp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbodr;
                return ((*odrp >> (31 - iopin->pin)) & 1) ^ 1;
        }
        return 0;
@@ -244,16 +244,16 @@ extern __inline__ void
 iopin_set_ded(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_papar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_papar;
                *parp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *parp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbpar;
+               volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbpar;
                *parp |= (1 << (31 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcpar;
                *parp |= (1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pdpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdpar;
                *parp |= (1 << (15 - iopin->pin));
        }
 }
@@ -262,16 +262,16 @@ extern __inline__ void
 iopin_set_gen(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_papar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_papar;
                *parp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *parp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbpar;
+               volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbpar;
                *parp &= ~(1 << (31 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcpar;
                *parp &= ~(1 << (15 - iopin->pin));
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pdpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdpar;
                *parp &= ~(1 << (15 - iopin->pin));
        }
 }
@@ -280,16 +280,16 @@ extern __inline__ uint
 iopin_is_ded(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_papar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_papar;
                return (*parp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *parp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbpar;
+               volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbpar;
                return (*parp >> (31 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcpar;
                return (*parp >> (15 - iopin->pin)) & 1;
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pdpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdpar;
                return (*parp >> (15 - iopin->pin)) & 1;
        }
        return 0;
@@ -299,16 +299,16 @@ extern __inline__ uint
 iopin_is_gen(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTA) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_papar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_papar;
                return ((*parp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTB) {
-               volatile uint *parp = &((immap_t *)CFG_IMMR)->im_cpm.cp_pbpar;
+               volatile uint *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_cpm.cp_pbpar;
                return ((*parp >> (31 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcpar;
                return ((*parp >> (15 - iopin->pin)) & 1) ^ 1;
        } else if (iopin->port == IOPIN_PORTD) {
-               volatile ushort *parp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pdpar;
+               volatile ushort *parp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pdpar;
                return ((*parp >> (15 - iopin->pin)) & 1) ^ 1;
        }
        return 0;
@@ -318,7 +318,7 @@ extern __inline__ void
 iopin_set_opt2(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *sorp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcso;
+               volatile ushort *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcso;
                *sorp |= (1 << (15 - iopin->pin));
        }
 }
@@ -327,7 +327,7 @@ extern __inline__ void
 iopin_set_opt1(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *sorp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcso;
+               volatile ushort *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcso;
                *sorp &= ~(1 << (15 - iopin->pin));
        }
 }
@@ -336,7 +336,7 @@ extern __inline__ uint
 iopin_is_opt2(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *sorp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcso;
+               volatile ushort *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcso;
                return (*sorp >> (15 - iopin->pin)) & 1;
        }
        return 0;
@@ -346,7 +346,7 @@ extern __inline__ uint
 iopin_is_opt1(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *sorp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcso;
+               volatile ushort *sorp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcso;
                return ((*sorp >> (15 - iopin->pin)) & 1) ^ 1;
        }
        return 0;
@@ -356,7 +356,7 @@ extern __inline__ void
 iopin_set_falledge(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *intp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcint;
+               volatile ushort *intp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcint;
                *intp |= (1 << (15 - iopin->pin));
        }
 }
@@ -365,7 +365,7 @@ extern __inline__ void
 iopin_set_anyedge(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *intp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcint;
+               volatile ushort *intp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcint;
                *intp &= ~(1 << (15 - iopin->pin));
        }
 }
@@ -374,7 +374,7 @@ extern __inline__ uint
 iopin_is_falledge(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *intp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcint;
+               volatile ushort *intp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcint;
                return (*intp >> (15 - iopin->pin)) & 1;
        }
        return 0;
@@ -384,7 +384,7 @@ extern __inline__ uint
 iopin_is_anyedge(iopin_t *iopin)
 {
        if (iopin->port == IOPIN_PORTC) {
-               volatile ushort *intp = &((immap_t *)CFG_IMMR)->im_ioport.iop_pcint;
+               volatile ushort *intp = &((immap_t *)CONFIG_SYS_IMMR)->im_ioport.iop_pcint;
                return ((*intp >> (15 - iopin->pin)) & 1) ^ 1;
        }
        return 0;