sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

fix: clean interrupt

This commit is contained in:
Michal Simek 2007-05-07 19:12:43 +02:00
parent 42efed6130
commit fb7c2dbef0
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/microblaze/Makefile
View File

@ -26,7 +26,8 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
SOBJS = dcache.o icache.o irq.o disable_int.o enable_int.o #SOBJS = dcache.o icache.o irq.o disable_int.o enable_int.o
SOBJS = dcache.o icache.o irq.o
COBJS = cpu.o interrupts.o cache.o exception.o timer.o COBJS = cpu.o interrupts.o cache.o exception.o timer.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)

13
cpu/microblaze/interrupts.c
View File

@ -36,12 +36,14 @@ extern void microblaze_enable_interrupts (void);
void enable_interrupts (void) void enable_interrupts (void)
{ {
microblaze_enable_interrupts (); __asm__ __volatile__ ("msrset r0, 0x2");
//microblaze_enable_interrupts ();
} }
int disable_interrupts (void) int disable_interrupts (void)
{ {
microblaze_disable_interrupts (); __asm__ __volatile__ ("msrclr r0, 0x2");
//microblaze_disable_interrupts ();
return 0; return 0;
} }
@ -49,6 +51,10 @@ int disable_interrupts (void)
#ifdef CFG_TIMER_0 #ifdef CFG_TIMER_0
extern void timer_init (void); extern void timer_init (void);
#endif #endif
#ifdef CFG_FSL_2
extern void fsl_init2 (void);
#endif
static struct irq_action vecs[CFG_INTC_0_NUM]; static struct irq_action vecs[CFG_INTC_0_NUM];
@ -140,6 +146,9 @@ int interrupts_init (void)
intc_init (); intc_init ();
#ifdef CFG_TIMER_0 #ifdef CFG_TIMER_0
timer_init (); timer_init ();
#endif
#ifdef CFG_FSL_2
fsl_init2 ();
#endif #endif
enable_interrupts (); enable_interrupts ();
return 0; return 0;