[U-Boot] [PATCH 08/14] microblaze: Use standard interrupt_init() function

Michal Simek michal.simek at xilinx.com
Tue Jan 27 16:20:30 CET 2015


Do not use microblaze specific interrupt init function.

Signed-off-by: Michal Simek <michal.simek at xilinx.com>
---

 arch/microblaze/cpu/interrupts.c              | 2 +-
 arch/microblaze/include/asm/microblaze_intc.h | 2 --
 arch/microblaze/lib/board.c                   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index f66ec69ee25e..b6d6610f2fd7 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -109,7 +109,7 @@ static void intc_init(void)
 	      intc->iar, intc->mer);
 }

-int interrupts_init(void)
+int interrupt_init(void)
 {
 	int i;

diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h
index 0fb9207882fe..65868386b0d8 100644
--- a/arch/microblaze/include/asm/microblaze_intc.h
+++ b/arch/microblaze/include/asm/microblaze_intc.h
@@ -34,5 +34,3 @@ struct irq_action {
  */
 int install_interrupt_handler(int irq, interrupt_handler_t *hdlr,
 				       void *arg);
-
-int interrupts_init(void);
diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index 600c80ab7666..bd028a63c078 100644
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -55,7 +55,7 @@ init_fnc_t *init_sequence[] = {
 #endif
 	display_banner,
 #ifndef CONFIG_SPL_BUILD
-	interrupts_init,
+	interrupt_init,
 	timer_init,
 #endif
 	NULL,
--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150127/5760fc07/attachment.pgp>


More information about the U-Boot mailing list