projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
cpu
/
nios2
/
interrupts.c
diff --git
a/cpu/nios2/interrupts.c
b/cpu/nios2/interrupts.c
index
ec5db31
..
1c3566e
100644
(file)
--- a/
cpu/nios2/interrupts.c
+++ b/
cpu/nios2/interrupts.c
@@
-37,8
+37,8
@@
#include <status_led.h>
#endif
#include <status_led.h>
#endif
-#if defined(C
FG_NIOS_TMRBASE) && !defined(CFG
_NIOS_TMRIRQ)
-#error C
FG
_NIOS_TMRIRQ not defined (see documentation)
+#if defined(C
ONFIG_SYS_NIOS_TMRBASE) && !defined(CONFIG_SYS
_NIOS_TMRIRQ)
+#error C
ONFIG_SYS
_NIOS_TMRIRQ not defined (see documentation)
#endif
/****************************************************************************/
#endif
/****************************************************************************/
@@
-74,7
+74,7
@@
void set_timer (ulong t)
/* The board must handle this interrupt if a timer is not
* provided.
*/
/* The board must handle this interrupt if a timer is not
* provided.
*/
-#if defined(C
FG
_NIOS_TMRBASE)
+#if defined(C
ONFIG_SYS
_NIOS_TMRBASE)
void tmr_isr (void *arg)
{
nios_timer_t *tmr = (nios_timer_t *)arg;
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);
* status register.
*/
writel (&tmr->status, 0);
- timestamp += C
FG
_NIOS_TMRMS;
+ timestamp += C
ONFIG_SYS
_NIOS_TMRMS;
#ifdef CONFIG_STATUS_LED
status_led_tick(timestamp);
#endif
#ifdef CONFIG_STATUS_LED
status_led_tick(timestamp);
#endif
@@
-90,22
+90,22
@@
void tmr_isr (void *arg)
static void tmr_init (void)
{
static void tmr_init (void)
{
- nios_timer_t *tmr =(nios_timer_t *)C
FG
_NIOS_TMRBASE;
+ nios_timer_t *tmr =(nios_timer_t *)C
ONFIG_SYS
_NIOS_TMRBASE;
writel (&tmr->status, 0);
writel (&tmr->control, 0);
writel (&tmr->control, NIOS_TIMER_STOP);
writel (&tmr->status, 0);
writel (&tmr->control, 0);
writel (&tmr->control, NIOS_TIMER_STOP);
-#if defined(C
FG
_NIOS_TMRCNT)
- writel (&tmr->periodl, C
FG
_NIOS_TMRCNT & 0xffff);
- writel (&tmr->periodh, (C
FG
_NIOS_TMRCNT >> 16) & 0xffff);
+#if defined(C
ONFIG_SYS
_NIOS_TMRCNT)
+ writel (&tmr->periodl, C
ONFIG_SYS
_NIOS_TMRCNT & 0xffff);
+ writel (&tmr->periodh, (C
ONFIG_SYS
_NIOS_TMRCNT >> 16) & 0xffff);
#endif
writel (&tmr->control, NIOS_TIMER_ITO | NIOS_TIMER_CONT |
NIOS_TIMER_START );
#endif
writel (&tmr->control, NIOS_TIMER_ITO | NIOS_TIMER_CONT |
NIOS_TIMER_START );
- irq_install_handler (C
FG
_NIOS_TMRIRQ, tmr_isr, (void *)tmr);
+ irq_install_handler (C
ONFIG_SYS
_NIOS_TMRIRQ, tmr_isr, (void *)tmr);
}
}
-#endif /* C
FG
_NIOS_TMRBASE */
+#endif /* C
ONFIG_SYS
_NIOS_TMRBASE */
/*************************************************************************/
int disable_interrupts (void)
/*************************************************************************/
int disable_interrupts (void)
@@
-195,7
+195,7
@@
int interrupt_init (void)
vecs[i].count = 0;
}
vecs[i].count = 0;
}
-#if defined(C
FG
_NIOS_TMRBASE)
+#if defined(C
ONFIG_SYS
_NIOS_TMRBASE)
tmr_init ();
#endif
tmr_init ();
#endif