minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

microblaze: Move FSL initialization to board.c

Browse Source 
Move FSL out of interrupt controller.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2010-04-16 11:43:43 +02:00
parent 5bbcb6cf22
commit b26640971a
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/microblaze/cpu/interrupts.c
View File

@ -46,10 +46,6 @@ int disable_interrupts (void)
} }
#ifdef CONFIG_SYS_INTC_0 #ifdef CONFIG_SYS_INTC_0
#ifdef CONFIG_SYS_FSL_2
extern void fsl_init2 (void);
#endif
static struct irq_action vecs[CONFIG_SYS_INTC_0_NUM]; static struct irq_action vecs[CONFIG_SYS_INTC_0_NUM];
@ -139,9 +135,6 @@ int interrupts_init (void)
} }
/* initialize intc controller */ /* initialize intc controller */
intc_init (); intc_init ();
#ifdef CONFIG_SYS_FSL_2
fsl_init2 ();
#endif
enable_interrupts (); enable_interrupts ();
return 0; return 0;
} }

7
arch/microblaze/lib/board.c
View File

@ -47,7 +47,9 @@ extern int eth_init (bd_t * bis);
#ifdef CONFIG_SYS_TIMER_0 #ifdef CONFIG_SYS_TIMER_0
extern int timer_init (void); extern int timer_init (void);
#endif #endif
#ifdef CONFIG_SYS_FSL_2
extern void fsl_init2 (void);
#endif
/* /*
* All attempts to come up with a "common" initialization sequence * All attempts to come up with a "common" initialization sequence
@ -74,6 +76,9 @@ init_fnc_t *init_sequence[] = {
#endif #endif
#ifdef CONFIG_SYS_TIMER_0 #ifdef CONFIG_SYS_TIMER_0
timer_init, timer_init,
#endif
#ifdef CONFIG_SYS_FSL_2
fsl_init2,
#endif #endif
NULL, NULL,
}; };

7
board/xilinx/microblaze-generic/microblaze-generic.c
View File

@ -60,10 +60,9 @@ void fsl_isr2 (void *arg) {
puts("*"); puts("*");
} }
void fsl_init2 (void) { int fsl_init2 (void) {
puts("fsl_init2\n"); puts("fsl_init2\n");
install_interrupt_handler (FSL_INTR_2,\ install_interrupt_handler (FSL_INTR_2, fsl_isr2, NULL);
fsl_isr2,\ return 0;
NULL);
} }
#endif #endif