projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blackfin: fix crash when booting from external memory
[oweals/u-boot.git]
/
cpu
/
microblaze
/
interrupts.c
diff --git
a/cpu/microblaze/interrupts.c
b/cpu/microblaze/interrupts.c
old mode 100755
(executable)
new mode 100644
(file)
index
b61153f
..
a6021c9
--- a/
cpu/microblaze/interrupts.c
+++ b/
cpu/microblaze/interrupts.c
@@
-45,19
+45,19
@@
int disable_interrupts (void)
return 0;
}
return 0;
}
-#ifdef C
FG
_INTC_0
-#ifdef C
FG
_TIMER_0
+#ifdef C
ONFIG_SYS
_INTC_0
+#ifdef C
ONFIG_SYS
_TIMER_0
extern void timer_init (void);
#endif
extern void timer_init (void);
#endif
-#ifdef C
FG
_FSL_2
+#ifdef C
ONFIG_SYS
_FSL_2
extern void fsl_init2 (void);
#endif
extern void fsl_init2 (void);
#endif
-static struct irq_action vecs[C
FG
_INTC_0_NUM];
+static struct irq_action vecs[C
ONFIG_SYS
_INTC_0_NUM];
/* mapping structure to interrupt controller */
/* mapping structure to interrupt controller */
-microblaze_intc_t *intc = (microblaze_intc_t *) (C
FG
_INTC_0_ADDR);
+microblaze_intc_t *intc = (microblaze_intc_t *) (C
ONFIG_SYS
_INTC_0_ADDR);
/* default handler */
void def_hdlr (void)
/* default handler */
void def_hdlr (void)
@@
-100,7
+100,7
@@
void install_interrupt_handler (int irq, interrupt_handler_t * hdlr, void *arg)
{
struct irq_action *act;
/* irq out of range */
{
struct irq_action *act;
/* irq out of range */
- if ((irq < 0) || (irq > C
FG
_INTC_0_NUM)) {
+ if ((irq < 0) || (irq > C
ONFIG_SYS
_INTC_0_NUM)) {
puts ("IRQ out of range\n");
return;
}
puts ("IRQ out of range\n");
return;
}
@@
-135,17
+135,17
@@
int interrupts_init (void)
{
int i;
/* initialize irq list */
{
int i;
/* initialize irq list */
- for (i = 0; i < C
FG
_INTC_0_NUM; i++) {
+ for (i = 0; i < C
ONFIG_SYS
_INTC_0_NUM; i++) {
vecs[i].handler = (interrupt_handler_t *) def_hdlr;
vecs[i].arg = (void *)i;
vecs[i].count = 0;
}
/* initialize intc controller */
intc_init ();
vecs[i].handler = (interrupt_handler_t *) def_hdlr;
vecs[i].arg = (void *)i;
vecs[i].count = 0;
}
/* initialize intc controller */
intc_init ();
-#ifdef C
FG
_TIMER_0
+#ifdef C
ONFIG_SYS
_TIMER_0
timer_init ();
#endif
timer_init ();
#endif
-#ifdef C
FG
_FSL_2
+#ifdef C
ONFIG_SYS
_FSL_2
fsl_init2 ();
#endif
enable_interrupts ();
fsl_init2 ();
#endif
enable_interrupts ();
@@
-190,8
+190,8
@@
void interrupt_handler (void)
}
#endif
}
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_IRQ)
-#ifdef C
FG
_INTC_0
+#if
defined(CONFI
G_CMD_IRQ)
+#ifdef C
ONFIG_SYS
_INTC_0
int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
@@
-201,9
+201,9
@@
int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
"Nr Routine Arg Count\n"
"-----------------------------\n");
"Nr Routine Arg Count\n"
"-----------------------------\n");
- for (i = 0; i < C
FG
_INTC_0_NUM; i++) {
+ for (i = 0; i < C
ONFIG_SYS
_INTC_0_NUM; i++) {
if (act->handler != (interrupt_handler_t*) def_hdlr) {
if (act->handler != (interrupt_handler_t*) def_hdlr) {
- printf ("%02d %08
lx %08l
x %d\n", i,
+ printf ("%02d %08
x %08
x %d\n", i,
(int)act->handler, (int)act->arg, act->count);
}
act++;
(int)act->handler, (int)act->arg, act->count);
}
act++;
@@
-217,4
+217,4
@@
int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
puts ("Undefined interrupt controller\n");
}
#endif
puts ("Undefined interrupt controller\n");
}
#endif
-#endif
/* CONFIG_COMMANDS & CFG_CMD_IRQ */
+#endif