imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / cpu / mpc8260 / interrupts.c

diff --git a/cpu/mpc8260/interrupts.c b/cpu/mpc8260/interrupts.c
index 56e9a721373f3245b3409d9ef001575e14e756e2..a7700c4b65da016d60d5226718c1312fb5f211f2 100755 (executable)
--- a/cpu/mpc8260/interrupts.c
+++ b/cpu/mpc8260/interrupts.c
@@ -82,7 +82,7 @@ static u_char irq_to_siubit[] = {
 
 static void m8260_mask_irq (unsigned int irq_nr)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        int bit, word;
        volatile uint *simr;
 
@@ -96,7 +96,7 @@ static void m8260_mask_irq (unsigned int irq_nr)
 
 static void m8260_unmask_irq (unsigned int irq_nr)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        int bit, word;
        volatile uint *simr;
 
@@ -110,7 +110,7 @@ static void m8260_unmask_irq (unsigned int irq_nr)
 
 static void m8260_mask_and_ack (unsigned int irq_nr)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        int bit, word;
        volatile uint *simr, *sipnr;
 
@@ -126,7 +126,7 @@ static void m8260_mask_and_ack (unsigned int irq_nr)
 
 static int m8260_get_irq (struct pt_regs *regs)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
        int irq;
        unsigned long bits;
 
@@ -142,9 +142,9 @@ static int m8260_get_irq (struct pt_regs *regs)
 
 int interrupt_init_cpu (unsigned *decrementer_count)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
 
-       *decrementer_count = (gd->bus_clk / 4) / CFG_HZ;
+       *decrementer_count = (gd->bus_clk / 4) / CONFIG_SYS_HZ;
 
        /* Initialize the default interrupt mapping priorities */
        immr->im_intctl.ic_sicr = 0;
@@ -246,7 +246,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
 
 /****************************************************************************/
 
-#if (CONFIG_COMMANDS & CFG_CMD_IRQ)
+#if defined(CONFIG_CMD_IRQ)
 
 /* ripped this out of ppc4xx/interrupts.c */
 
@@ -276,4 +276,4 @@ do_irqinfo (cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[])
                enable_interrupts ();
 }
 
-#endif                                                 /* CONFIG_COMMANDS & CFG_CMD_IRQ */
+#endif