X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cpu%2Fnios2%2Finterrupts.c;h=1c3566ebf95610e2e171d02775a9b2cb0c59f183;hb=6d0f6bcf337c5261c08fabe12982178c2c489d76;hp=ec5db31b0ff468132680ba7b881a0fddcb7f96ed;hpb=71edc271816ec82cf0550dd6980be2da3cc2ad9e;p=platform%2Fkernel%2Fu-boot.git

diff --git a/cpu/nios2/interrupts.c b/cpu/nios2/interrupts.c
index ec5db31b..1c3566e 100644
--- a/cpu/nios2/interrupts.c
+++ b/cpu/nios2/interrupts.c
@@ -37,8 +37,8 @@
 #include <status_led.h>
 #endif
 
-#if defined(CFG_NIOS_TMRBASE) && !defined(CFG_NIOS_TMRIRQ)
-#error CFG_NIOS_TMRIRQ not defined (see documentation)
+#if defined(CONFIG_SYS_NIOS_TMRBASE) && !defined(CONFIG_SYS_NIOS_TMRIRQ)
+#error CONFIG_SYS_NIOS_TMRIRQ not defined (see documentation)
 #endif
 
 /****************************************************************************/
@@ -74,7 +74,7 @@ void set_timer (ulong t)
 /* The board must handle this interrupt if a timer is not
  * provided.
  */
-#if defined(CFG_NIOS_TMRBASE)
+#if defined(CONFIG_SYS_NIOS_TMRBASE)
 void tmr_isr (void *arg)
 {
 	nios_timer_t *tmr = (nios_timer_t *)arg;
@@ -82,7 +82,7 @@ void tmr_isr (void *arg)
 	 * status register.
 	 */
 	writel (&tmr->status, 0);
-	timestamp += CFG_NIOS_TMRMS;
+	timestamp += CONFIG_SYS_NIOS_TMRMS;
 #ifdef CONFIG_STATUS_LED
 	status_led_tick(timestamp);
 #endif
@@ -90,22 +90,22 @@ void tmr_isr (void *arg)
 
 static void tmr_init (void)
 {
-	nios_timer_t *tmr =(nios_timer_t *)CFG_NIOS_TMRBASE;
+	nios_timer_t *tmr =(nios_timer_t *)CONFIG_SYS_NIOS_TMRBASE;
 
 	writel (&tmr->status, 0);
 	writel (&tmr->control, 0);
 	writel (&tmr->control, NIOS_TIMER_STOP);
 
-#if defined(CFG_NIOS_TMRCNT)
-	writel (&tmr->periodl, CFG_NIOS_TMRCNT & 0xffff);
-	writel (&tmr->periodh, (CFG_NIOS_TMRCNT >> 16) & 0xffff);
+#if defined(CONFIG_SYS_NIOS_TMRCNT)
+	writel (&tmr->periodl, CONFIG_SYS_NIOS_TMRCNT & 0xffff);
+	writel (&tmr->periodh, (CONFIG_SYS_NIOS_TMRCNT >> 16) & 0xffff);
 #endif
 	writel (&tmr->control, NIOS_TIMER_ITO | NIOS_TIMER_CONT |
 			  NIOS_TIMER_START );
-	irq_install_handler (CFG_NIOS_TMRIRQ, tmr_isr, (void *)tmr);
+	irq_install_handler (CONFIG_SYS_NIOS_TMRIRQ, tmr_isr, (void *)tmr);
 }
 
-#endif /* CFG_NIOS_TMRBASE */
+#endif /* CONFIG_SYS_NIOS_TMRBASE */
 
 /*************************************************************************/
 int disable_interrupts (void)
@@ -195,7 +195,7 @@ int interrupt_init (void)
 		vecs[i].count = 0;
 	}
 
-#if defined(CFG_NIOS_TMRBASE)
+#if defined(CONFIG_SYS_NIOS_TMRBASE)
 	tmr_init ();
 #endif